Skip to content

Soldier/Drone tuning & 32's Stop Shuttles Melting #862

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
Merged
merged 18 commits into from
May 25, 2025
Merged

Soldier/Drone tuning & 32's Stop Shuttles Melting #862

merged 18 commits into from
May 25, 2025

Conversation

Yorkoh
Copy link
Contributor

@Yorkoh Yorkoh commented Mar 25, 2025 •
edited
Loading

About the pull request

Tuning Intent: Turn the Soldier caste into more of a reliable enemy-type to use with less frustrating mechanics on players. Drones ideally are for horde-mode style rounds, whereas Soldiers are to be used in smaller quantities for more lethal small-scale skirmishes.

What has changed: Made some edits to Soldier action behaviour, specifically Fling and Tail Stab. Fling, in my opinion, is overused by this caste and leads to 'pinballing' from walls. Reduced their speed and their speed at pulling bodies slightly.

Also upped drone's acid blood dmg slightly, to be more movie-ish accurate.

Also, per 32's request, housing their acid turf fixes.

Explain why it's good for the game

Less pinballing & juggling players by soldiers, makes them a viable threat to be used more regularly without being frustrating. They are still incredibly dangerous in large numbers and can easily incapacitate a lone player who isn't quick on the draw. Drone acid just makes them slightly more dangerous at close range but not egregiously so.

Testing Photographs and Procedure

Changelog

🆑
balance: reduced xeno death acid spray to radius 1 (was 2)
add: drone acid_blood_damage = 25 (it was default 15)
balance: soldier acid_blood_damage = 30 (it was 35)
balance: Aggression required for Fling is now 70, from 35.
balance: ai_prob_chance for Fling is now 25, from 70.
balance: cooldown for Fling is now 10 seconds, from 8.
balance: Aggression required for Tail Stab is now 50, from 70.
balance: ai_prob_chance for Tail Stab is now 40, from 65.
balance: cooldown for Tail Stab is now 15 seconds, from 11.
fix: The32bitguy's acid turf fixes, to stop shuttles melting to acid
fix: Bone Resin Walls are now unacidable
balance: reduced Soldier movement speed from -1 to -0.9
balance: edited Soldier "no hive" aggression base from 50 to 40
balance: edited Soldier pull_multiplier from 0.2 to 0.4
/:cl:

@Yorkoh
Copy link
Contributor Author

Yorkoh commented Mar 25, 2025

oh. Did I misunderstand the changelog? Should I have just c&p'd the lines I edited?

@cm13-github
Copy link
Contributor

cm13-github commented Mar 25, 2025 •
edited
Loading

Test merge deployment history:

Test Merge Deployed @ 03/25/2025 23:29:34 +00:00:
Server Instance

PVECM: Red

Merged By

Rob606

Revision

Origin: 384d501
Pull Request: dde44ed
Server: bc1159df9ef545123f291bc5a35d733f19145986

Test Merge Deployed @ 03/26/2025 02:54:50 +00:00:
Server Instance

PVECM: Blue

Merged By

Athena14

Revision

Origin: 384d501
Pull Request: dde44ed
Server: e4aa0dd48c269ed91ec60dfc4297a8c0699951ab

Test Merge Deployed @ 03/26/2025 18:48:11 +00:00:
Server Instance

PVECM: Green

Merged By

lordloko

Revision

Origin: 08f2790
Pull Request: 6a55f91
Server: 0d25ca7c3573aaf6808a7851ee46bc304c0c4ce7

Test Merge Updated @ 03/26/2025 22:31:30 +00:00:
Server Instance

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: 08f2790
Pull Request: 6a55f91
Server: d1671cfb1a39bb25156df6cb3881810f5cda0513

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

PVECM: Red

Merged By

Athena14

Revision

Origin: 08f2790
Pull Request: 6a55f91
Server: b0a0118ec96ea64baf90d67a44c0891b2203c7cd

Test Merge Removed @ 03/27/2025 04:03:36 +00:00:
Server Instance

PVECM: Blue

Test Merge Deployed @ 03/27/2025 12:47:08 +00:00:
Server Instance

PVECM: Blue

Merged By

lordloko

Revision

Origin: 08f2790
Pull Request: 6a55f91
Server: 1994e6d8298e542dd6cea66244948442e091a8da

Test Merge Updated @ 03/27/2025 17:01:37 +00:00:
Server Instance

PVECM: Blue

Merged By

lordloko

Revision

Origin: 08f2790
Pull Request: 6a55f91
Server: 71f14f7915a7b8d3b05999f8273f7aac2309347e

Test Merge Updated @ 03/27/2025 17:29:49 +00:00:
Server Instance

PVECM: Blue

Merged By

Pandora029

Revision

Origin: 08f2790
Pull Request: 6a55f91
Server: 175f166cf7de1d375e35ae70ce0a67e35d484c5e

Test Merge Removed @ 03/27/2025 21:23:57 +00:00:
Server Instance

PVECM: Red

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

PVECM: Green

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

PVECM: Green

Merged By

lordloko

Revision

Origin: 934ac37
Pull Request: 6a55f91
Server: 5347eeb013df16765c5ce3b20ad0678abf10c750

Test Merge Deployed @ 03/29/2025 00:02:46 +00:00:
Server Instance

PVECM: Red

Merged By

The32bitguy

Revision

Origin: 934ac37
Pull Request: 6a55f91
Server: 36f480fe7d79c0b25ee3b0327fceb9d31a05d457

Test Merge Updated @ 03/29/2025 13:03:42 +00:00:
Server Instance

PVECM: Red

Merged By

The32bitguy

Revision

Origin: 934ac37
Pull Request: 6a55f91
Server: 33716919e98a478e15b99557dbcffebb8c622660

Test Merge Updated @ 03/29/2025 13:57:45 +00:00:
Server Instance

PVECM: Red

Merged By

The32bitguy

Revision

Origin: 934ac37
Pull Request: 6a55f91
Server: 5a7160d9842692eec175ba1ecc1521c0a5a8bcbc

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

PVECM: Green

Test Merge Removed @ 03/30/2025 03:02:42 +00:00:
Server Instance

PVECM: Red

Test Merge Deployed @ 03/30/2025 10:02:10 +00:00:
Server Instance

PVECM: Red

Merged By

The32bitguy

Revision

Origin: ccfd444
Pull Request: 6a55f91
Server: 5e22f4c131148e3e3a5223e9814fa78668c9f8c7

Test Merge Updated @ 03/30/2025 16:56:21 +00:00:
Server Instance

PVECM: Red

Merged By

Some Random Username

Revision

Origin: ccfd444
Pull Request: 6a55f91
Server: 146792b5d94e67d44226cdcfb23260996a90d0f7

Test Merge Updated @ 03/30/2025 17:29:12 +00:00:
Server Instance

PVECM: Blue

Merged By

lordloko

Revision

Origin: ccfd444
Pull Request: 6a55f91
Server: 4d1144cd691ba9fefe284d67edeb1e7850f3082d

Test Merge Updated @ 03/31/2025 21:12:08 +00:00:
Server Instance

PVECM: Red

Merged By

lordloko

Revision

Origin: ccfd444
Pull Request: 6a55f91
Server: bc8d187704686b8fe4ed7487250e0aabce9612da

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

PVECM: Red

Test Merge Deployed @ 04/02/2025 23:12:40 +00:00:
Server Instance

PVECM: Red

Merged By

Rob606

Revision

Origin: b190850
Pull Request: 6a55f91
Server: 9e5aa155ece1ee9489ef84d00c0e788f6dbd8ca4

Test Merge Updated @ 04/02/2025 23:28:29 +00:00:
Server Instance

PVECM: Red

Merged By

Rob606

Revision

Origin: b190850
Pull Request: 6a55f91
Server: 03bf47a2e9227d1b83c178335eb94954156c5f37

Test Merge Removed @ 04/03/2025 05:17:55 +00:00:
Server Instance

PVECM: Blue

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

PVECM: Red

Merged By

MessageCypher

Revision

Origin: b190850
Pull Request: 6a55f91
Server: 6a197ad8e29e1aa332c0ee7aada74658322bf54f

Test Merge Updated @ 04/03/2025 17:42:18 +00:00:
Server Instance

PVECM: Red

Merged By

lordloko

Revision

Origin: b190850
Pull Request: 6a55f91
Server: 544fa6483916ee53ae8476a905cf84aaf5812352

Test Merge Updated @ 04/03/2025 17:47:07 +00:00:
Server Instance

PVECM: Red

Merged By

lordloko

Revision

Origin: b190850
Pull Request: 6a55f91
Server: ed0e6e664f6370045083ba69a018aa5fe754eff6

Test Merge Updated @ 04/03/2025 21:32:48 +00:00:
Server Instance

PVECM: Red

Merged By

Some Random Username

Revision

Origin: b190850
Pull Request: 6a55f91
Server: e9e021648be4a8be96d785daf688a4907c12984d

Test Merge Updated @ 04/04/2025 01:27:42 +00:00:
Server Instance

PVECM: Red

Merged By

Some Random Username

Revision

Origin: b190850
Pull Request: 6a55f91
Server: 622c0916985dc6964706d4e9ce58b0c5628a1e9e

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

PVECM: Red

Merged By

Some Random Username

Revision

Origin: b190850
Pull Request: 6a55f91
Server: 88c9ae1ed5c23749da79a626615b4e346460265d

Test Merge Updated @ 04/04/2025 17:57:09 +00:00:
Server Instance

PVECM: Red

Merged By

lordloko

Revision

Origin: b190850
Pull Request: 6a55f91
Server: b08e714368e7908a3d3e4ff2293758cedcd51048

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

PVECM: Red

Merged By

Kirsh

Revision

Origin: b190850
Pull Request: 6a55f91
Server: 9ddf29721938071164349d849572650ad73101c9

Test Merge Updated @ 04/05/2025 22:52:20 +00:00:
Server Instance

PVECM: Red

Merged By

Some Random Username

Revision

Origin: b190850
Pull Request: 6a55f91
Server: cd62c2032dd9081942a51af311587ab93b58498b

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

PVECM: Red

Merged By

Rob606

Revision

Origin: 2249a53
Pull Request: 6a55f91
Server: 46ee3141748744c82fea6aceceeb195fe7cdea7e

Test Merge Deployed @ 04/07/2025 04:50:33 +00:00:
Server Instance

PVECM: Green

Merged By

Athena14

Revision

Origin: 59a7196
Pull Request: 6a55f91
Server: f2cddfc68099af8494bb14f686a894937e80a33f

Test Merge Deployed @ 04/07/2025 16:09:37 +00:00:
Server Instance

PVECM: Blue

Merged By

The32bitguy

Revision

Origin: 59a7196
Pull Request: 0d1b3dd
Server: 9e15781783b25d561d5eb23f4457e9e0d5ae92f1

Test Merge Updated @ 04/07/2025 23:32:08 +00:00:
Server Instance

PVECM: Red

Merged By

Rob606

Revision

Origin: 59a7196
Pull Request: 0d1b3dd
Server: bd68b4149e5d03e403ae3aff975a0ea4fcf51ea5

Test Merge Updated @ 04/08/2025 02:51:37 +00:00:
Server Instance

PVECM: Blue

Merged By

The32bitguy

Revision

Origin: 1c8b40b
Pull Request: 0d1b3dd
Server: bbe038f51923a785cf730a16b183739b9227c840

Test Merge Updated @ 04/08/2025 13:20:57 +00:00:
Server Instance

PVECM: Blue

Merged By

MessageCypher

Revision

Origin: 1c8b40b
Pull Request: 0d1b3dd
Server: bd48d83b0b00a30326c18cb1e914d3bdba85216f

Test Merge Removed @ 04/08/2025 17:47:46 +00:00:
Server Instance

PVECM: Blue

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

PVECM: Red

Merged By

Merrgear

Revision

Origin: 3fdaf21
Pull Request: 0d1b3dd
Server: 90f9717550f278507c8fc4ce3e96a4de2c1c471a

Test Merge Updated @ 04/09/2025 16:37:21 +00:00:
Server Instance

PVECM: Red

Merged By

EmiSol

Revision

Origin: dd80a60
Pull Request: 0d1b3dd
Server: ce29288cdf7e9a01cb4052b5b7481b4a9fe545f8

Test Merge Updated @ 04/09/2025 17:05:52 +00:00:
Server Instance

PVECM: Red

Merged By

EmiSol

Revision

Origin: dd80a60
Pull Request: 0d1b3dd
Server: 0c22d8ba2eb09f3b5296fbeed98af62b19dcde22

Test Merge Updated @ 04/09/2025 18:31:17 +00:00:
Server Instance

PVECM: Green

Merged By

Athena14

Revision

Origin: a688e1c
Pull Request: 0d1b3dd
Server: 83d05af52cba531a966069e3d1218c604c8ac10f

Test Merge Updated @ 04/09/2025 21:39:38 +00:00:
Server Instance

PVECM: Red

Merged By

lordloko

Revision

Origin: a688e1c
Pull Request: 0d1b3dd
Server: 229939fc284eed2b3c064aa0b88bfc06b6cd53ef

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

PVECM: Blue

Merged By

Rob606

Revision

Origin: a688e1c
Pull Request: 0d1b3dd
Server: 9d3c3c932323fc10457e42232a4efedb9d6d232b

Test Merge Updated @ 04/10/2025 00:14:45 +00:00:
Server Instance

PVECM: Blue

Merged By

Rob606

Revision

Origin: 383da65
Pull Request: 0d1b3dd
Server: c904a4473ea415bf7cd3bf4928b35491c2d7731d

Test Merge Updated @ 04/10/2025 00:46:01 +00:00:
Server Instance

PVECM: Red

Merged By

Pandora029

Revision

Origin: 383da65
Pull Request: 0d1b3dd
Server: c428753148479db84953e0a75533ac98d24e9ded

Test Merge Updated @ 04/10/2025 19:19:37 +00:00:
Server Instance

PVECM: Blue

Merged By

lordloko

Revision

Origin: f42638d
Pull Request: 0d1b3dd
Server: e24103c265b15dee60f67a69e392b77d98b78be3

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

PVECM: Green

Merged By

Wettowels

Revision

Origin: f42638d
Pull Request: 0d1b3dd
Server: cb774483090052dae0def6bdd54b2a029aad02f3

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

PVECM: Red

Merged By

MessageCypher

Revision

Origin: f42638d
Pull Request: 0d1b3dd
Server: 0c0b05533a25cbad83f6891308626ba00b44ffc6

Test Merge Updated @ 04/11/2025 13:14:25 +00:00:
Server Instance

PVECM: Blue

Merged By

The32bitguy

Revision

Origin: f42638d
Pull Request: 0d1b3dd
Server: fb66b773b9a2828b8f5b28c625b537dba472af41

Test Merge Updated @ 04/11/2025 19:20:08 +00:00:
Server Instance

PVECM: Red

Merged By

AndroBetel

Revision

Origin: f42638d
Pull Request: 0d1b3dd
Server: 1b2e87ae27438f7c8bc12093b8589a3df8709c8a

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

PVECM: Red

Merged By

AndroBetel

Revision

Origin: f42638d
Pull Request: 0d1b3dd
Server: 335d9b1d9bf5d121fdc4d05e1842e4299d967604

Test Merge Updated @ 04/11/2025 22:10:00 +00:00:
Server Instance

PVECM: Red

Merged By

MessageCypher

Revision

Origin: f42638d
Pull Request: 0d1b3dd
Server: 0c0b05533a25cbad83f6891308626ba00b44ffc6

Test Merge Updated @ 04/12/2025 00:32:48 +00:00:
Server Instance

PVECM: Red

Merged By

Rob606

Revision

Origin: f42638d
Pull Request: 0d1b3dd
Server: 4266748b84ff82b4f1cb89420563eece66e99767

Test Merge Removed @ 04/12/2025 12:49:54 +00:00:
Server Instance

PVECM: Green

Test Merge Updated @ 04/12/2025 17:38:57 +00:00:
Server Instance

PVECM: Red

Merged By

Kirsh

Revision

Origin: f42638d
Pull Request: 0d1b3dd
Server: 15f2c06e0bad402d52d0716b8df18a143ceb58a7

Test Merge Deployed @ 04/12/2025 20:55:27 +00:00:
Server Instance

PVECM: Green

Merged By

lordloko

Revision

Origin: f42638d
Pull Request: 0d1b3dd
Server: d1436b100b125d0c582d48da70eab0764c624084

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

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: f42638d
Pull Request: 0d1b3dd
Server: 145ffe944a47c3989e5c437f6f5426f7a229d8b3

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

PVECM: Blue

Merged By

Merrgear

Revision

Origin: f42638d
Pull Request: 0d1b3dd
Server: 433911fc402323fa629cd302597d6e2af487853d

Test Merge Updated @ 04/13/2025 03:30:34 +00:00:
Server Instance

PVECM: Red

Merged By

Rob606

Revision

Origin: 785d59a
Pull Request: 0d1b3dd
Server: f89bda4216e6fba6844ca0d2715abb7bab46ff71

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

PVECM: Green

Merged By

Athena14

Revision

Origin: 785d59a
Pull Request: 0d1b3dd
Server: c3f0b56f43e2bce78f1212ca0a084b1210b5d017

Test Merge Removed @ 04/13/2025 13:24:58 +00:00:
Server Instance

PVECM: Green

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

PVECM: Red

Merged By

MessageCypher

Revision

Origin: 785d59a
Pull Request: 0d1b3dd
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: 0d1b3dd
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: 0d1b3dd
Server: 38aec3653bb5dfc18babb9441ad4d3c7fdb324dc

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

PVECM: Blue

Merged By

Merrgear

Revision

Origin: 785d59a
Pull Request: 0d1b3dd
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: 0d1b3dd
Server: 83d71aae1dd3f2f4d63a4d8341ee472d30ad65e9

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

PVECM: Red

Merged By

Rob606

Revision

Origin: a0c6796
Pull Request: 0d1b3dd
Server: f36ff0f87cfacf5e3975db87a4c9261da5cb0404

Test Merge Updated @ 04/15/2025 07:17:11 +00:00:
Server Instance

PVECM: Red

Merged By

MessageCypher

Revision

Origin: a0c6796
Pull Request: 0d1b3dd
Server: 875862a7d74effb111d253b9c536212f334f3223

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

PVECM: Green

Merged By

Athena14

Revision

Origin: a0c6796
Pull Request: 0d1b3dd
Server: 750a3a4bcc71776fb41a07fcb28854badd62ab8c

Test Merge Updated @ 04/15/2025 19:12:09 +00:00:
Server Instance

PVECM: Green

Merged By

Rob606

Revision

Origin: 4027a3e
Pull Request: 0d1b3dd
Server: 18e9132b0ba9edfbffe538a088e65f7c7fdc669d

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

PVECM: Blue

Merged By

The32bitguy

Revision

Origin: a0c6796
Pull Request: 0d1b3dd
Server: 5cf6039797c6baf99a31b43842c37b57fa9d7ab5

Test Merge Updated @ 04/15/2025 20:28:25 +00:00:
Server Instance

PVECM: Blue

Merged By

The32bitguy

Revision

Origin: 4027a3e
Pull Request: 0d1b3dd
Server: dfc47e77604caa837ea2e623e534a5ac3b87d5f2

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

PVECM: Red

Merged By

Some Random Username

Revision

Origin: 4027a3e
Pull Request: 0d1b3dd
Server: 877ad1fc7abf9ce7704a7e5bb88cf178641e417d

Test Merge Updated @ 04/16/2025 12:58:17 +00:00:
Server Instance

PVECM: Red

Merged By

AndroBetel

Revision

Origin: 463bff6
Pull Request: 0d1b3dd
Server: 94b8628552fc38fa1c530179d5306227239c4e45

Test Merge Updated @ 04/16/2025 13:14:45 +00:00:
Server Instance

PVECM: Red

Merged By

AndroBetel

Revision

Origin: 463bff6
Pull Request: 0d1b3dd
Server: 81f275111342bd9146010cad67364d20795a936b

Test Merge Updated @ 04/16/2025 15:23:25 +00:00:
Server Instance

PVECM: Red

Merged By

AndroBetel

Revision

Origin: 463bff6
Pull Request: 0d1b3dd
Server: 9e42ebf5dec1eeaf3e12ef3493108e33f6416230

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

PVECM: Blue

Merged By

The32bitguy

Revision

Origin: 463bff6
Pull Request: 0d1b3dd
Server: 28ea2ca01235c3c092c20fe14d0a64982a1e0416

Test Merge Updated @ 04/16/2025 18:43:05 +00:00:
Server Instance

PVECM: Green

Merged By

lordloko

Revision

Origin: 463bff6
Pull Request: 0d1b3dd
Server: 9b5b67c6848e49ce2a65b23ee718f88079d7a138

Test Merge Updated @ 04/16/2025 23:32:54 +00:00:
Server Instance

PVECM: Red

Merged By

Rob606

Revision

Origin: 463bff6
Pull Request: 0d1b3dd
Server: 121673dff9d31c4901370bb305aa74ed12ee2fcb

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

PVECM: Red

Merged By

Athena14

Revision

Origin: 3618b7d
Pull Request: 0d1b3dd
Server: 42b633a8dd22896e7ba45bde709f68baaedd5bc7

Test Merge Updated @ 04/17/2025 14:57:54 +00:00:
Server Instance

PVECM: Red

Merged By

Athena14

Revision

Origin: 3618b7d
Pull Request: 0d1b3dd
Server: 0245bfd7ff1c0a7ad02d50dc497a720deb9569e9

Test Merge Updated @ 04/17/2025 18:38:53 +00:00:
Server Instance

PVECM: Red

Merged By

Rob606

Revision

Origin: 3618b7d
Pull Request: 0d1b3dd
Server: b4c445a04ec3dd353b705577bbb3c9a8f5ab1231

Test Merge Updated @ 04/17/2025 21:27:36 +00:00:
Server Instance

PVECM: Green

Merged By

Some Random Username

Revision

Origin: 3618b7d
Pull Request: 0d1b3dd
Server: d59100d09fa85a0fef55fbca34e0adab617dd106

Test Merge Updated @ 04/17/2025 22:18:23 +00:00:
Server Instance

PVECM: Green

Merged By

Rob606

Revision

Origin: 3618b7d
Pull Request: 0d1b3dd
Server: d0c4520dd8c605ab145a8f0cef1b5c13ed94ef7b

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

PVECM: Green

Merged By

Athena14

Revision

Origin: b3bd5af
Pull Request: 0d1b3dd
Server: 7f146c481540c2fce1486b30caa021c6b9635795

Test Merge Updated @ 04/18/2025 19:02:04 +00:00:
Server Instance

PVECM: Red

Merged By

Joooks

Revision

Origin: b3bd5af
Pull Request: 0d1b3dd
Server: 59b5f84f91de7f67512450195ce2a1c56d7586a9

Test Merge Updated @ 04/18/2025 22:49:49 +00:00:
Server Instance

PVECM: Green

Merged By

Rob606

Revision

Origin: b3bd5af
Pull Request: 0d1b3dd
Server: 084d58b9859d194c80843c31d6d2531574550dd8

Test Merge Updated @ 04/19/2025 04:18:37 +00:00:
Server Instance

PVECM: Green

Merged By

StinkethStonketh

Revision

Origin: b3bd5af
Pull Request: 0d1b3dd
Server: 7e79419f626ced5f748c763f7724b09ea9599f6e

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

PVECM: Blue

Merged By

The32bitguy

Revision

Origin: b3bd5af
Pull Request: 0d1b3dd
Server: 4162beb93683cbd7af76203aee200fec4a7e752a

Test Merge Updated @ 04/19/2025 13:07:21 +00:00:
Server Instance

PVECM: Blue

Merged By

The32bitguy

Revision

Origin: b3bd5af
Pull Request: 0d1b3dd
Server: a6e5402b4db47bf950231a3adcbb261cbd791e38

Test Merge Updated @ 04/19/2025 13:47:37 +00:00:
Server Instance

PVECM: Blue

Merged By

The32bitguy

Revision

Origin: b3bd5af
Pull Request: 0d1b3dd
Server: ba9cce08ce601b4b9af749c26f7ed4fee9c6c4c5

Test Merge Removed @ 04/19/2025 16:02:17 +00:00:
Server Instance

PVECM: Red

Test Merge Updated @ 04/20/2025 01:22:38 +00:00:
Server Instance

PVECM: Green

Merged By

Wettowels

Revision

Origin: b3bd5af
Pull Request: 0d1b3dd
Server: e2dbaf95c15896d287da1433b8067ab08eec2503

Test Merge Updated @ 04/20/2025 01:26:44 +00:00:
Server Instance

PVECM: Green

Merged By

Wettowels

Revision

Origin: b3bd5af
Pull Request: 0d1b3dd
Server: 078fdf2ce5d849e27861b009c3e1dd7dace46d19

Test Merge Updated @ 04/20/2025 01:41:57 +00:00:
Server Instance

PVECM: Green

Merged By

Wettowels

Revision

Origin: b3bd5af
Pull Request: 0d1b3dd
Server: 06b79ed0c1f45cbf702baae1cb9c7c12658bb388

Test Merge Updated @ 04/20/2025 05:56:36 +00:00:
Server Instance

PVECM: Green

Merged By

mesnomer

Revision

Origin: b3bd5af
Pull Request: 0d1b3dd
Server: 623f3d9b85faec43511f2eed2d782f3d086a7789

Test Merge Updated @ 04/21/2025 01:39:21 +00:00:
Server Instance

PVECM: Green

Merged By

Wettowels

Revision

Origin: b3bd5af
Pull Request: 0d1b3dd
Server: 1b21afd35bcf088f16b99c3243b1b235533f3857

Test Merge Updated @ 04/21/2025 02:08:05 +00:00:
Server Instance

PVECM: Green

Merged By

Wettowels

Revision

Origin: b3bd5af
Pull Request: 0d1b3dd
Server: d7fd30e97af070eed24857dddb5912c9a5bb631d

Test Merge Updated @ 04/21/2025 18:13:51 +00:00:
Server Instance

PVECM: Green

Merged By

mesnomer

Revision

Origin: b3bd5af
Pull Request: 0d1b3dd
Server: efdb83cd1ea206bb781565de978ce13db57b5daa

Test Merge Removed @ 04/21/2025 19:38:17 +00:00:
Server Instance

PVECM: Blue

Test Merge Deployed @ 04/22/2025 19:03:26 +00:00:
Server Instance

PVECM: Red

Merged By

lordloko

Revision

Origin: a47d884
Pull Request: 0d1b3dd
Server: 022cdc458554d06acf4004a761ce651d036ec080

Test Merge Updated @ 04/22/2025 21:33:24 +00:00:
Server Instance

PVECM: Green

Merged By

Some Random Username

Revision

Origin: a47d884
Pull Request: 0d1b3dd
Server: 78b4f6f6433057f78e90ed263768f1602acc9f52

Test Merge Updated @ 04/23/2025 00:50:10 +00:00:
Server Instance

PVECM: Green

Merged By

Wettowels

Revision

Origin: 07fa745
Pull Request: 0d1b3dd
Server: 91626cb71765e796921a01ef3b2dfb50e359cfab

Test Merge Updated @ 04/23/2025 09:33:58 +00:00:
Server Instance

PVECM: Red

Merged By

MessageCypher

Revision

Origin: 20ee98d
Pull Request: 0d1b3dd
Server: 972edcf643c4d4df875e0f06c1165c42f19b6ae4

Test Merge Updated @ 04/23/2025 21:17:22 +00:00:
Server Instance

PVECM: Red

Merged By

Kirsh

Revision

Origin: 20ee98d
Pull Request: 0d1b3dd
Server: 8ab6dc7497d385f9a1c76d3556919fcc9ad2b37e

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

PVECM: Red

Merged By

Merrgear

Revision

Origin: 20ee98d
Pull Request: 0d1b3dd
Server: bc3574b901e46c8613643b76e16df47a5dff087c

Test Merge Deployed @ 04/24/2025 00:24:32 +00:00:
Server Instance

PVECM: Blue

Merged By

Rob606

Revision

Origin: 20ee98d
Pull Request: 0d1b3dd
Server: 3d782daab4dcf21fc30508059966d2682d3a386b

Test Merge Updated @ 04/24/2025 03:41:00 +00:00:
Server Instance

PVECM: Red

Merged By

Emilitia Ennehrt

Revision

Origin: 20ee98d
Pull Request: 0d1b3dd
Server: 00493788c0d789bd01ba3a70d911c41d389ac235

Test Merge Removed @ 04/24/2025 13:33:54 +00:00:
Server Instance

PVECM: Blue

Test Merge Updated @ 04/24/2025 18:44:43 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: 20ee98d
Pull Request: 0d1b3dd
Server: c4ff94af94e9b3548220f6c0b4cb280e0eac42e6

Test Merge Updated @ 04/24/2025 20:59:26 +00:00:
Server Instance

PVECM: Red

Merged By

Some Random Username

Revision

Origin: 20ee98d
Pull Request: 0d1b3dd
Server: cd1008856bd4436737a62db70349660688bd100d

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

PVECM: Green

Merged By

StinkethStonketh

Revision

Origin: 20ee98d
Pull Request: 0d1b3dd
Server: 019c6f56236df01d33ebe222518f623e8eac2080

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

PVECM: Green

Merged By

Joooks

Revision

Origin: 20ee98d
Pull Request: 0d1b3dd
Server: 0d3d5b38af57defdd06c35d1a67ea33067cbb385

Test Merge Updated @ 04/25/2025 22:26:40 +00:00:
Server Instance

PVECM: Red

Merged By

Pandora029

Revision

Origin: 20ee98d
Pull Request: 0d1b3dd
Server: 083f960d3c9368603a7ad705f46a4563226d5f35

Test Merge Updated @ 04/25/2025 23:07:14 +00:00:
Server Instance

PVECM: Green

Merged By

Athena14

Revision

Origin: 20ee98d
Pull Request: 0d1b3dd
Server: bf1f1e719786b17ff92d091b35c95787ab5cd759

Test Merge Removed @ 04/26/2025 17:52:27 +00:00:
Server Instance

PVECM: Red

Test Merge Updated @ 04/26/2025 18:17:56 +00:00:
Server Instance

PVECM: Green

Merged By

Wettowels

Revision

Origin: 20ee98d
Pull Request: 0d1b3dd
Server: ef76ec7a260a930d4b5350a742d0e25d4dd6f577

Test Merge Deployed @ 04/27/2025 00:21:55 +00:00:
Server Instance

PVECM: Blue

Merged By

Rob606

Revision

Origin: 20ee98d
Pull Request: 0d1b3dd
Server: 434b2af6f78439ab7f31120cfff77bd30cf71fbc

Test Merge Updated @ 04/27/2025 15:28:26 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: 4743cb1
Pull Request: 0d1b3dd
Server: f40717ced81750595e6e09357d9dd907b216afe5

Test Merge Updated @ 04/27/2025 16:51:12 +00:00:
Server Instance

PVECM: Blue

Merged By

Wettowels

Revision

Origin: 4743cb1
Pull Request: 0d1b3dd
Server: d5014b7958b65d648c670e938a28dbcfe90a8f31

Test Merge Updated @ 04/27/2025 19:32:37 +00:00:
Server Instance

PVECM: Blue

Merged By

Wettowels

Revision

Origin: 4743cb1
Pull Request: 0d1b3dd
Server: 7209fcc6e1f5b368ec950b41c5bdf97441f93b0c

Test Merge Deployed @ 04/27/2025 20:11:36 +00:00:
Server Instance

PVECM: Red

Merged By

Rob606

Revision

Origin: 4743cb1
Pull Request: 0d1b3dd
Server: eb3eb4e36cb723c5d7a973ec2e2168e1bcf90dbb

Test Merge Removed @ 04/27/2025 23:09:57 +00:00:
Server Instance

PVECM: Red

Test Merge Updated @ 04/28/2025 13:25:02 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: 4743cb1
Pull Request: 0d1b3dd
Server: 0533f8db06ccfd514e04a5664abf1499b481fb56

Test Merge Updated @ 04/29/2025 02:13:16 +00:00:
Server Instance

PVECM: Green

Merged By

Athena14

Revision

Origin: ce83162
Pull Request: 94a79af
Server: d946b9a0fee1c49ead9295cb376ac59eb827d73c

Test Merge Removed @ 04/29/2025 22:35:29 +00:00:
Server Instance

PVECM: Green

Test Merge Updated @ 04/30/2025 00:23:45 +00:00:
Server Instance

PVECM: Blue

Merged By

Merrgear

Revision

Origin: 7a0fef0
Pull Request: af0e607
Server: aec3599bc5bee8cd6b9760a37a145a5e2c5a2f6b

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

PVECM: Blue

Merged By

Merrgear

Revision

Origin: 7a0fef0
Pull Request: af0e607
Server: 19fc88dbadaa35df3f9369c7ae32521ffb3bc039

Test Merge Deployed @ 04/30/2025 02:39:20 +00:00:
Server Instance

PVECM: Red

Merged By

Some Random Username

Revision

Origin: 7a0fef0
Pull Request: 80ab284
Server: 3edf386a946a01983410f177f7a10c29d50e5a6f

Test Merge Updated @ 04/30/2025 07:51:02 +00:00:
Server Instance

PVECM: Red

Merged By

Emilitia Ennehrt

Revision

Origin: 7a0fef0
Pull Request: 80ab284
Server: 58c5a3650df307646a565d53821a14defe408309

Test Merge Updated @ 04/30/2025 21:12:43 +00:00:
Server Instance

PVECM: Red

Merged By

lordloko

Revision

Origin: 7e020da
Pull Request: e3bea89
Server: 5b8512df9fac9802a270a35ed279f5b522092030

Test Merge Removed @ 05/01/2025 09:17:23 +00:00:
Server Instance

PVECM: Red

Test Merge Removed @ 05/02/2025 01:57:23 +00:00:
Server Instance

PVECM: Blue

Test Merge Deployed @ 05/02/2025 15:43:52 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: 7e020da
Pull Request: e3bea89
Server: b8bf058b7ae5db9abbebe528673a96853b63cb98

Test Merge Updated @ 05/02/2025 16:35:16 +00:00:
Server Instance

PVECM: Green

Merged By

Warfan

Revision

Origin: 7e020da
Pull Request: e3bea89
Server: 145ec025a08df8d4222ab4cdee370dbccb42af92

Test Merge Deployed @ 05/03/2025 00:24:54 +00:00:
Server Instance

PVECM: Red

Merged By

Athena14

Revision

Origin: 7e020da
Pull Request: e3bea89
Server: 5e86b09b392def30d145321c7fc6eea02a8891f6

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

PVECM: Red

Merged By

Athena14

Revision

Origin: 7e020da
Pull Request: e3bea89
Server: 2c8bcc2837a5199c2d290fe4483ed4aab20a2c6d

Test Merge Deployed @ 05/03/2025 00:46:50 +00:00:
Server Instance

PVECM: Blue

Merged By

Rob606

Revision

Origin: 7e020da
Pull Request: e3bea89
Server: d2c0e101c92200979507f16886da8543164052a1

Test Merge Updated @ 05/03/2025 05:10:54 +00:00:
Server Instance

PVECM: Red

Merged By

Emilitia Ennehrt

Revision

Origin: 7e020da
Pull Request: e3bea89
Server: 8fc9084ad392702735ec030996fda0b9f6b0f5b0

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

PVECM: Green

Merged By

Xan

Revision

Origin: 7e020da
Pull Request: e3bea89
Server: 0d5e65fba0e41c3991ef82e3edeb8a1c61ba0b51

Test Merge Updated @ 05/03/2025 14:35:50 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: 7e020da
Pull Request: e3bea89
Server: 5d4f0b86fe4a684f3facc691cad129bce754d9a2

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

PVECM: Red

Merged By

Some Random Username

Revision

Origin: 7e020da
Pull Request: e3bea89
Server: c03c6f47ed5c00d750824b1beb2b1908724f92c0

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

PVECM: Red

Merged By

Some Random Username

Revision

Origin: 7e020da
Pull Request: e3bea89
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: e3bea89
Server: bc3e1b55eb3e540f52f10d1ab62e3e073e4ae147

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

PVECM: Red

Test Merge Updated @ 05/03/2025 23:52:59 +00:00:
Server Instance

PVECM: Blue

Merged By

Some Random Username

Revision

Origin: 7e020da
Pull Request: e3bea89
Server: 899b73c054f110dbf1c7abcc541a9b84abc48c44

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

PVECM: Blue

Merged By

Rob606

Revision

Origin: 7e020da
Pull Request: e3bea89
Server: 50bbd177b98b57ed4fbfa7a62c60b22d3279a937

Test Merge Updated @ 05/04/2025 00:34:28 +00:00:
Server Instance

PVECM: Blue

Merged By

Rob606

Revision

Origin: 7e020da
Pull Request: e3bea89
Server: 6fb48e242f142480ad4c64f90d70dfc512871dfa

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

PVECM: Green

Merged By

Merrgear

Revision

Origin: 7e020da
Pull Request: acccef0
Server: e61d9fff9ac9efcd872c304cb3dfd94ebe787ec9

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

PVECM: Blue

Merged By

Emilitia Ennehrt

Revision

Origin: 7e020da
Pull Request: acccef0
Server: f0eedd277b9826f5abaa44594d50215a9e397243

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

PVECM: Blue

Merged By

Emilitia Ennehrt

Revision

Origin: 7e020da
Pull Request: acccef0
Server: f0ad8988dd7640257dad27d3f46aac250a7d944b

Test Merge Updated @ 05/04/2025 10:48:46 +00:00:
Server Instance

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: 7e020da
Pull Request: acccef0
Server: 33d9ffcddf24d11e4cec4d63440f9d722779eeb3

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

PVECM: Red

Merged By

Athena14

Revision

Origin: 7e020da
Pull Request: acccef0
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: acccef0
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: acccef0
Server: 533072c0bf112c3f62cea054f964f0ddd5799540

Test Merge Updated @ 05/04/2025 20:18:57 +00:00:
Server Instance

PVECM: Green

Merged By

StinkethStonketh

Revision

Origin: 7e020da
Pull Request: acccef0
Server: 9a0e127d650996590121458c0edd90270b28551b

Test Merge Removed @ 05/05/2025 06:05:07 +00:00:
Server Instance

PVECM: Green

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

PVECM: Red

Merged By

MessageCypher

Revision

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

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

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: 7e020da
Pull Request: acccef0
Server: f4d6b331826658dffbe0944e9908dcc6a5456847

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

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: 7e020da
Pull Request: acccef0
Server: 944afd6b1a3de31a27fe9060f9e3834ffc5b69d7

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

PVECM: Green

Merged By

Joooks

Revision

Origin: 7e020da
Pull Request: acccef0
Server: bdba2aab97f4cc48262ec7939889e0db48ceaa0f

Test Merge Removed @ 05/06/2025 15:51:30 +00:00:
Server Instance

PVECM: Blue

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

PVECM: Red

Merged By

EmiSol

Revision

Origin: acb3f60
Pull Request: acccef0
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: acccef0
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: acccef0
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: acccef0
Server: 74d012034293a277a622dbbd528f8c4b84afa4a0

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

PVECM: Green

Merged By

Joooks

Revision

Origin: acb3f60
Pull Request: acccef0
Server: 4d9dd3b5585c2a8c7b36f86327ff5996aa979535

Test Merge Updated @ 05/07/2025 20:35:05 +00:00:
Server Instance

PVECM: Green

Merged By

StinkethStonketh

Revision

Origin: acb3f60
Pull Request: acccef0
Server: 14b7281478f8926fa59705824e1d68373320bfb4

Test Merge Removed @ 05/08/2025 01:16:33 +00:00:
Server Instance

PVECM: Green

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

PVECM: Green

Merged By

Athena14

Revision

Origin: e522938
Pull Request: acccef0
Server: 16bcde68b8315ae2fe28d0b667d2771632c0374a

Test Merge Updated @ 05/08/2025 09:13:37 +00:00:
Server Instance

PVECM: Green

Merged By

Athena14

Revision

Origin: e522938
Pull Request: acccef0
Server: e988850c26f6170a43fb0bbebd72c30b2a0af8cd

Test Merge Updated @ 05/08/2025 09:15:38 +00:00:
Server Instance

PVECM: Green

Merged By

Athena14

Revision

Origin: e522938
Pull Request: acccef0
Server: f79efea15f0a2d4c17fba6ea8540c90632570136

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

PVECM: Red

Merged By

MessageCypher

Revision

Origin: e522938
Pull Request: acccef0
Server: f03c29e82220a18062b02fdfd6f1e2e679ceeb05

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

PVECM: Red

Merged By

Some Random Username

Revision

Origin: 07f897a
Pull Request: acccef0
Server: 640ad733f7be023de294008ac99e6493dc164820

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

PVECM: Green

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

PVECM: Red

Test Merge Deployed @ 05/11/2025 02:47:36 +00:00:
Server Instance

PVECM: Blue

Merged By

EmiSol

Revision

Origin: 907dec9
Pull Request: acccef0
Server: d2ada0db94af15e53e33741e93b78cbd386737d0

Test Merge Updated @ 05/12/2025 11:17:47 +00:00:
Server Instance

PVECM: Blue

Merged By

EmiSol

Revision

Origin: 907dec9
Pull Request: acccef0
Server: 5f06c6f7c0fa596d64e8c58862fe393dceb4b1ce

Test Merge Removed @ 05/13/2025 04:28:21 +00:00:
Server Instance

PVECM: Blue

Test Merge Deployed @ 05/16/2025 08:44:57 +00:00:
Server Instance

PVECM: Blue

Merged By

The32bitguy

Revision

Origin: a3dbcb7
Pull Request: acccef0
Server: 75fefb6a19c3c536cc84ea789b715123a781d2d3

Test Merge Deployed @ 05/16/2025 14:03:29 +00:00:
Server Instance

PVECM: Red

Merged By

Rob606

Revision

Origin: a3dbcb7
Pull Request: acccef0
Server: 15b2ebbbe64625e6937ff26093fb85433976e09b

Test Merge Updated @ 05/16/2025 18:58:07 +00:00:
Server Instance

PVECM: Red

Merged By

lordloko

Revision

Origin: a3dbcb7
Pull Request: acccef0
Server: 74facc98e2a8ea3e084e2b8ba8b8ebecadbf098a

Test Merge Updated @ 05/16/2025 19:08:56 +00:00:
Server Instance

PVECM: Red

Merged By

lordloko

Revision

Origin: a3dbcb7
Pull Request: acccef0
Server: a96f3f80c8944356380ff0d9ab18ccaa89d0d4ca

Test Merge Updated @ 05/17/2025 01:14:24 +00:00:
Server Instance

PVECM: Red

Merged By

Rob606

Revision

Origin: a3dbcb7
Pull Request: acccef0
Server: e086d93739d1761471fccacaadd81bd7484ad59f

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

PVECM: Red

Merged By

Emilitia Ennehrt

Revision

Origin: a3dbcb7
Pull Request: acccef0
Server: 14dab9d44d5c211c74e00461417ad20fc60a4422

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

PVECM: Red

Merged By

AndroBetel

Revision

Origin: a3dbcb7
Pull Request: acccef0
Server: b61fd1f5e703a6347e9d4d013687d0c4e9529be2

Test Merge Updated @ 05/17/2025 13:42:21 +00:00:
Server Instance

PVECM: Red

Merged By

EmiSol

Revision

Origin: a3dbcb7
Pull Request: acccef0
Server: f7fd435777f3d9d30bdea38177f5d9248793c448

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

PVECM: Red

Merged By

EmiSol

Revision

Origin: c33d5a0
Pull Request: acccef0
Server: 0edbe98b1faf06d3c600d34c22da5152470722d7

Test Merge Updated @ 05/18/2025 14:09:11 +00:00:
Server Instance

PVECM: Red

Merged By

lordloko

Revision

Origin: c33d5a0
Pull Request: acccef0
Server: 7f788737afea5505293b86ea8ec572749c9225af

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

PVECM: Red

Merged By

lordloko

Revision

Origin: c33d5a0
Pull Request: acccef0
Server: fae7577674c33f9bc17b80033bb3c8f6a7d458e4

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

PVECM: Blue

Test Merge Updated @ 05/18/2025 22:42:34 +00:00:
Server Instance

PVECM: Red

Merged By

Rob606

Revision

Origin: c33d5a0
Pull Request: acccef0
Server: a78f7579a0bc07f990df3d9920d5eafce901b75b

Test Merge Updated @ 05/19/2025 15:58:38 +00:00:
Server Instance

PVECM: Red

Merged By

AndroBetel

Revision

Origin: c33d5a0
Pull Request: acccef0
Server: a80d29f3925df41b01924174cbcde14ab909b118

Test Merge Removed @ 05/20/2025 01:50:14 +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: acccef0
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: acccef0
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: acccef0
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: acccef0
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: acccef0
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: acccef0
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: acccef0
Server: cc948356549a168b687af517b76d413edf8e6b03

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

PVECM: Green

Merged By

Rob606

Revision

Origin: 030879c
Pull Request: acccef0
Server: 2a6c156613d6e23800eec4c829e3681e536407aa

Test Merge Updated @ 05/22/2025 20:32:16 +00:00:
Server Instance

PVECM: Green

Merged By

AndroBetel

Revision

Origin: 030879c
Pull Request: acccef0
Server: 89defc87d3849100956451d9c593487315e5dfb5

Test Merge Updated @ 05/23/2025 00:22:24 +00:00:
Server Instance

PVECM: Green

Merged By

Rob606

Revision

Origin: 1056165
Pull Request: acccef0
Server: 3feb3136ee2fc5ae775b84f010d14b0fd5ce30d9

Test Merge Removed @ 05/23/2025 00:28:36 +00:00:
Server Instance

PVECM: Green

Test Merge Deployed @ 05/23/2025 00:39:22 +00:00:
Server Instance

PVECM: Green

Merged By

Rob606

Revision

Origin: 1056165
Pull Request: acccef0
Server: c3a484a63f87a7295d1d433c79d9802e94b6fc0b

Test Merge Updated @ 05/23/2025 00:44:17 +00:00:
Server Instance

PVECM: Green

Merged By

Rob606

Revision

Origin: 1056165
Pull Request: acccef0
Server: 35cd059ae5d6a64fd6c3e8cdaab2fb1814b52734

Test Merge Updated @ 05/23/2025 00:48:14 +00:00:
Server Instance

PVECM: Green

Merged By

StinkethStonketh

Revision

Origin: 1056165
Pull Request: acccef0
Server: b6de8eea12730508e4fdb0b962a845fc8bb20cce

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

PVECM: Green

Merged By

Rob606

Revision

Origin: 1056165
Pull Request: acccef0
Server: 2ecc0323fa0fa8ad7cc46bdc029f964d77c13240

Test Merge Updated @ 05/23/2025 01:20:41 +00:00:
Server Instance

PVECM: Green

Merged By

Rob606

Revision

Origin: 1056165
Pull Request: acccef0
Server: ca52057a2495d9b7111d0e998d50aef060a63dae

Test Merge Updated @ 05/23/2025 09:02:28 +00:00:
Server Instance

PVECM: Green

Merged By

Suno

Revision

Origin: 1056165
Pull Request: acccef0
Server: 6b4bddb1c8fd7e1c897567a32bd7847ddafcbda6

Test Merge Deployed @ 05/23/2025 11:11:21 +00:00:
Server Instance

PVECM: Blue

Merged By

AndroBetel

Revision

Origin: 1056165
Pull Request: acccef0
Server: 6f890b6a1ee23b3587925cbde8bca0cd9148b9da

Test Merge Updated @ 05/23/2025 13:07:39 +00:00:
Server Instance

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: 8fe2bfc
Pull Request: acccef0
Server: a951c291f3e7c8cd875e6bbf386d4010b0d3bf79

Test Merge Updated @ 05/23/2025 14:31:08 +00:00:
Server Instance

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: 8fe2bfc
Pull Request: 275c6a8
Server: 40db7cebc0957172b8dab28b5c8e2940867a3341

Test Merge Deployed @ 05/23/2025 23:29:40 +00:00:
Server Instance

PVECM: Red

Merged By

Rob606

Revision

Origin: 93402a8
Pull Request: 275c6a8
Server: 1c0afd237b9f29da62d4e229388e4a7cae14f39e

Test Merge Updated @ 05/24/2025 00:33:29 +00:00:
Server Instance

PVECM: Red

Merged By

Rob606

Revision

Origin: 1c66ba4
Pull Request: 275c6a8
Server: d3a4ba30e197ceb46f4f621678890087b7841f96

Test Merge Updated @ 05/24/2025 08:54:56 +00:00:
Server Instance

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: 1c66ba4
Pull Request: 275c6a8
Server: 50269560818cef18547d3f2e8dc062cfb9c033c9

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

PVECM: Blue

Merged By

Xan

Revision

Origin: 1c66ba4
Pull Request: 275c6a8
Server: 9a1842a208d4cefe815182dc20fa047d936bc01f

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

PVECM: Blue

Merged By

Xan

Revision

Origin: 1c66ba4
Pull Request: 275c6a8
Server: d3d6950aaa68ae570f6fdf420b0a6f8ca61d001c

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

PVECM: Blue

Test Merge Updated @ 05/25/2025 06:19:08 +00:00:
Server Instance

PVECM: Green

Merged By

StinkethStonketh

Revision

Origin: 1c66ba4
Pull Request: 275c6a8
Server: bacfec009c6ab31b018b9344450523ab9276cd65

Test Merge Deployed @ 05/25/2025 06:24:17 +00:00:
Server Instance

PVECM: Blue

Merged By

StinkethStonketh

Revision

Origin: 1c66ba4
Pull Request: 275c6a8
Server: aad390445b742b598315d25599b71c99831429f1

Test Merge Updated @ 05/25/2025 09:01:39 +00:00:
Server Instance

PVECM: Red

Merged By

lordloko

Revision

Origin: 1c66ba4
Pull Request: 275c6a8
Server: 7894d3582e1cbb62c6a226639cd8878e9edbe505

Test Merge Updated @ 05/25/2025 09:11:12 +00:00:
Server Instance

PVECM: Red

Merged By

AndroBetel

Revision

Origin: 1c66ba4
Pull Request: 275c6a8
Server: 9b7f25e51357b67ce9fe0e61862d7ec9171567fd

Test Merge Updated @ 05/25/2025 17:18:43 +00:00:
Server Instance

PVECM: Red

Merged By

Rob606

Revision

Origin: 93ff930
Pull Request: 275c6a8
Server: 1c6d787437c25623a185a5f92dd5619df4116bb6

Test Merge Updated @ 05/25/2025 18:17:26 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: 8374ab6
Pull Request: 275c6a8
Server: 0b1526c505d7e6399b10edf58cd3c13d06d701d4

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

PVECM: Blue

Test Merge Removed @ 05/26/2025 01:40:40 +00:00:
Server Instance

PVECM: Red

Test Merge Removed @ 05/26/2025 14:05:59 +00:00:
Server Instance

PVECM: Green

@Yorkoh Yorkoh changed the title Soldier & Drone tuning Soldier/Drone tuning & 32's Stop Shuttles Melting Mar 26, 2025
@cmss13-ci cmss13-ci bot added the fix label Mar 28, 2025
@Blacklist897 Blacklist897 mentioned this pull request Apr 12, 2025
Closed
3 tasks
@Spacefire5 Spacefire5 mentioned this pull request Apr 12, 2025
Closed
3 tasks
@Gentlefood Gentlefood mentioned this pull request Apr 13, 2025
Open
3 tasks
@Blacklist897 Blacklist897 mentioned this pull request Apr 18, 2025
Open
3 tasks
@Spacefire5 Spacefire5 mentioned this pull request Apr 19, 2025
Closed
3 tasks
@cmss13-ci cmss13-ci bot added the Mapping label Apr 28, 2025
@Yorkoh
Copy link
Contributor Author

Yorkoh commented Apr 30, 2025

need to remove the mapping tag. I fucked my master branch with a map I was working on and had to revert back but it messed with this PR.

@Drulikar Drulikar removed the Mapping label Apr 30, 2025
Yorkoh added a commit to Yorkoh/cmss13-pve-606 that referenced this pull request May 11, 2025
@Yorkoh
Hardcore Drones & Soldiers
f1ee22c 
# About the pull request

Upped Drone and Soldier caste in terms of damage output, speed and armor levels. Reduced their HP somewhat. Disabled soldier "melt on death" mechanic.

# Explain why it's good for the game

For the occasions GMs want to run hardcore variants of standard Xenos.

# Testing Photographs and Procedure
ran locally

<!-- !! If you are modifying sprites, you **must** include one or more in-game screenshots or videos of the new sprites. !! -->

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

Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags.

</details>

# Changelog

<!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly label your changes in the changelog. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. -->
<!-- If you add a name after the ':cl', that name will be used in the changelog. You must add your CKEY after the CL if your GitHub name doesn't match. Maintainers freely reserve the right to remove and add tags should they deem it appropriate. -->

:cl:
add: New health defines for DRONE and SOLDIER (both lower than standard)
add: New "RAPTOR" speed define for Soldier
balance: Upped Drone Armor, Speed and Damage
balance: Upped Soldier Armor, Speed and Damage
balance: Upped Drone acid values (same as cmss13-devs#862)
balance: Disabled Soldier's death melting acid
/:cl:

<!-- Both :cl:'s are required for the changelog to work! -->
@Yorkoh Yorkoh mentioned this pull request May 11, 2025
Open
@BonniePandora BonniePandora enabled auto-merge (squash) May 25, 2025 22:24
@BonniePandora BonniePandora merged commit a6dbef6 into cmss13-devs:master May 25, 2025
42 checks passed
cmss13-ci bot added a commit that referenced this pull request May 25, 2025
@cmss13-ci
Automatic changelog for PR #862 [ci skip]
d580ddf
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Balance Feature fix
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Yorkoh @cm13-github @BonniePandora @Drulikar