-
Notifications
You must be signed in to change notification settings - Fork 177
[MBDIGNORE] [TM Only] Firebase Zulu LV818 AND USS Golden Arrow Tethered #782
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Conversation
Test merge deployment history:Test Merge Updated @ 03/23/2025 09:05:10 +00:00:Server InstancePVECM: Green Merged ByDrathek RevisionOrigin: 1172d1f Test Merge Updated @ 03/23/2025 09:33:14 +00:00:Server InstancePVECM: Green Merged BySpartanBobby RevisionOrigin: 1172d1f Test Merge Removed @ 03/24/2025 14:12:20 +00:00:Server InstancePVECM: Green Test Merge Deployed @ 03/26/2025 02:54:50 +00:00:Server InstancePVECM: Blue Merged ByAthena14 RevisionOrigin: 384d501 Test Merge Removed @ 03/27/2025 04:03:36 +00:00:Server InstancePVECM: Blue Test Merge Deployed @ 03/28/2025 00:26:40 +00:00:Server InstancePVECM: Green Merged ByMessageCypher RevisionOrigin: 934ac37 Test Merge Removed @ 03/28/2025 19:37:19 +00:00:Server InstancePVECM: Green Test Merge Deployed @ 04/01/2025 12:55:27 +00:00:Server InstancePVECM: Red Merged ByAndroBetel RevisionOrigin: a8c03b5 Test Merge Updated @ 04/01/2025 18:42:24 +00:00:Server InstancePVECM: Red Merged ByMerrgear RevisionOrigin: a8c03b5 Test Merge Removed @ 04/02/2025 01:57:23 +00:00:Server InstancePVECM: Red Test Merge Deployed @ 04/04/2025 00:45:36 +00:00:Server InstancePVECM: Green Merged ByPandora029 RevisionOrigin: b190850 Test Merge Updated @ 04/04/2025 02:46:03 +00:00:Server InstancePVECM: Green Merged ByMessageCypher RevisionOrigin: b190850 Test Merge Removed @ 04/05/2025 03:56:38 +00:00:Server InstancePVECM: Green Test Merge Deployed @ 04/13/2025 00:15:27 +00:00:Server InstancePVECM: Green Merged BySpartanBobby RevisionOrigin: f42638d Test Merge Deployed @ 04/13/2025 00:15:39 +00:00:Server InstancePVECM: Blue Merged ByMerrgear RevisionOrigin: f42638d Test Merge Removed @ 04/13/2025 13:20:12 +00:00:Server InstancePVECM: Green Test Merge Deployed @ 04/13/2025 14:39:20 +00:00:Server InstancePVECM: Red Merged ByMessageCypher RevisionOrigin: 785d59a Test Merge Updated @ 04/13/2025 14:43:55 +00:00:Server InstancePVECM: Red Merged ByMessageCypher RevisionOrigin:
10000
785d59a Test Merge Updated @ 04/13/2025 15:15:00 +00:00:Server InstancePVECM: Red Merged ByMessageCypher RevisionOrigin: 785d59a Test Merge Updated @ 04/13/2025 19:58:57 +00:00:Server InstancePVECM: Blue Merged ByMerrgear RevisionOrigin: 785d59a Test Merge Removed @ 04/14/2025 00:33:18 +00:00:Server InstancePVECM: Blue Test Merge Removed @ 04/15/2025 00:16:11 +00:00:Server InstancePVECM: Red Test Merge Deployed @ 04/19/2025 04:18:37 +00:00:Server InstancePVECM: Green Merged ByStinkethStonketh RevisionOrigin: b3bd5af Test Merge Removed @ 04/20/2025 01:22:38 +00:00:Server InstancePVECM: Green Test Merge Deployed @ 04/21/2025 19:19:27 +00:00:Server InstancePVECM: Red Merged ByMerrgear RevisionOrigin: 253099a Test Merge Updated @ 04/22/2025 14:34:12 +00:00:Server InstancePVECM: Red Merged ByMessageCypher RevisionOrigin: a47d884 Test Merge Updated @ 04/22/2025 14:42:53 +00:00:Server InstancePVECM: Red Merged ByMessageCypher RevisionOrigin: a47d884 Test Merge Removed @ 04/22/2025 18:21:19 +00:00:Server InstancePVECM: Red Test Merge Deployed @ 04/25/2025 00:27:05 +00:00:Server InstancePVECM: Green Merged ByStinkethStonketh RevisionOrigin: 20ee98d Test Merge Removed @ 04/25/2025 16:01:23 +00:00:Server InstancePVECM: Green Test Merge Deployed @ 04/30/2025 00:23:45 +00:00:Server InstancePVECM: Blue Merged ByMerrgear RevisionOrigin: 7a0fef0 Test Merge Updated @ 04/30/2025 00:29:36 +00:00:Server InstancePVECM: Blue Merged ByMerrgear RevisionOrigin: 7a0fef0 Test Merge Deployed @ 05/01/2025 05:13:00 +00:00:Server InstancePVECM: Green Merged ByAthena14 RevisionOrigin: 7e020da Test Merge Removed @ 05/01/2025 19:02:39 +00:00:Server InstancePVECM: Green Test Merge Removed @ 05/02/2025 01:57:23 +00:00:Server InstancePVECM: Blue Test Merge Deployed @ 05/02/2025 02:01:40 +00:00:Server InstancePVECM: Blue Merged ByAthena14 RevisionOrigin: 7e020da Test Merge Removed @ 05/03/2025 00:46:50 +00:00:Server InstancePVECM: Blue Test Merge Deployed @ 05/04/2025 04:02:42 +00:00:Server InstancePVECM: Green Merged ByMerrgear RevisionOrigin: 7e020da Test Merge Deployed @ 05/04/2025 09:50:40 +00:00:Server InstancePVECM: Red Merged ByMessageCypher RevisionOrigin: 7e020da Test Merge Removed @ 05/04/2025 10:48:46 +00:00:Server InstancePVECM: Green Test Merge Removed @ 05/04/2025 12:38:24 +00:00:Server InstancePVECM: Red Test Merge Deployed @ 05/07/2025 07:34:49 +00:00:Server InstancePVECM: Red Merged ByMessageCypher RevisionOrigin: acb3f60 Test Merge Updated @ 05/07/2025 13:16:49 +00:00:Server InstancePVECM: Red Merged ByPandora029 RevisionOrigin: acb3f60 Test Merge Updated @ 05/08/2025 13:32:03 +00:00:Server InstancePVECM: Red Merged ByMessageCypher RevisionOrigin: e522938 Test Merge Removed @ 05/08/2025 21:46:47 +00:00:Server InstancePVECM: Red Test Merge Deployed @ 05/08/2025 23:46:33 +00:00:Server InstancePVECM: Green Merged ByAthena14 RevisionOrigin: 07f897a Test Merge Updated @ 05/09/2025 22:12:03 +00:00:Server InstancePVECM: Green Merged ByMerrgear RevisionOrigin: 907dec9 Test Merge Deployed @ 05/10/2025 04:39:54 +00:00:Server InstancePVECM: Red Merged ByMessageCypher RevisionOrigin: 907dec9 Test Merge Removed @ 05/10/2025 18:59:00 +00:00:Server InstancePVECM: Green Test Merge Removed @ 05/11/2025 21:06:52 +00:00:Server InstancePVECM: Red Test Merge Deployed @ 05/12/2025 13:21:27 +00:00:Server InstancePVECM: Green Merged ByXan RevisionOrigin: 907dec9 Test Merge Updated @ 05/12/2025 14:03:20 +00:00:Server InstancePVECM: Green Merged ByXan RevisionOrigin: 907dec9 Test Merge Removed @ 05/13/2025 14:25:40 +00:00:Server InstancePVECM: Green Test Merge Deployed @ 05/15/2025 14:18:48 +00:00:Server InstancePVECM: Red Merged ByMessageCypher RevisionOrigin: a3dbcb7 Test Merge Removed @ 05/16/2025 00:05:49 +00:00:Server InstancePVECM: Red Test Merge Deployed @ 05/24/2025 12:35:00 +00:00:Server InstancePVECM: Blue Merged ByXan RevisionOrigin: 1c66ba4 Test Merge Updated @ 05/24/2025 12:55:34 +00:00:Server InstancePVECM: Blue Merged ByXan RevisionOrigin: 1c66ba4 Test Merge Removed @ 05/25/2025 00:25:15 +00:00:Server InstancePVECM: Blue Test Merge Deployed @ 05/25/2025 23:50:09 +00:00:Server InstancePVECM: Blue Merged ByXan RevisionOrigin: e660c4e Test Merge Removed @ 05/26/2025 04:26:46 +00:00:Server InstancePVECM: Blue Test Merge Deployed @ 05/27/2025 05:14:16 +00:00:Server InstancePVECM: Green Merged ByEonoc RevisionOrigin: dd93556 Test Merge Removed @ 05/27/2025 13:21:29 +00:00:Server InstancePVECM: Green Test Merge Deployed @ 05/29/2025 23:51:49 +00:00:Server InstancePVECM: Blue Merged ByXan RevisionOrigin: 75811db Test Merge Removed @ 05/30/2025 09:57:16 +00:00:Server InstancePVECM: Blue Test Merge Deployed @ 06/03/2025 10:46:11 +00:00:Server InstancePVECM: Blue Merged ByKarmac RevisionOrigin: c0d8100 Test Merge Updated @ 06/03/2025 11:09:35 +00:00:Server InstancePVECM: Blue Merged ByKarmac RevisionOrigin: c0d8100 Test Merge Updated @ 06/04/2025 02:05:31 +00:00:Server InstancePVECM: Blue Merged Byshorttemperedleprech RevisionOrigin: c0d8100 Test Merge Updated @ 06/04/2025 14:16:30 +00:00:Server InstancePVECM: Blue Merged ByXan RevisionOrigin: c0d8100 Test Merge Removed @ 06/04/2025 19:54:44 +00:00:Server InstancePVECM: Blue Test Merge Deployed @ 06/07/2025 05:53:32 +00:00:Server InstancePVECM: Red Merged ByKarmac RevisionOrigin: c0d8100 Test Merge Deployed @ 06/07/2025 06:38:08 +00:00:Server InstancePVECM: Green Merged BySpartanBobby RevisionOrigin: c0d8100 Test Merge Removed @ 06/07/2025 08:14:57 +00:00:Server InstancePVECM: Green Test Merge Removed @ 06/07/2025 10:02:14 +00:00:Server InstancePVECM: Red Test Merge Deployed @ 06/07/2025 15:16:59 +00:00:Server InstancePVECM: Green Merged ByKarmac RevisionOrigin: c0d8100 Test Merge Removed @ 06/07/2025 18:12:22 +00:00:Server InstancePVECM: Green Test Merge Deployed @ 06/09/2025 16:56:12 +00:00:Server InstancePVECM: Blue Merged ByXan RevisionOrigin: 620f2c5 Test Merge Updated @ 06/10/2025 15:13:22 +00:00:Server InstancePVECM: Blue Merged Bytwizzums RevisionOrigin: 620f2c5 Test Merge Removed @ 06/11/2025 14:39:26 +00:00:Server InstancePVECM: Blue Test Merge Deployed @ 06/11/2025 14:43:44 +00:00:Server InstancePVECM: Green Merged ByKarmac RevisionOrigin: 620f2c5 Test Merge Updated @ 06/11/2025 18:38:19 +00:00:Server InstancePVECM: Green Merged Byshorttemperedleprech RevisionOrigin: 620f2c5 Test Merge Removed @ 06/12/2025 10:46:46 +00:00:Server InstancePVECM: Green Test Merge Deployed @ 06/19/2025 04:11:33 +00:00:Server InstancePVECM: Green Merged ByStinkethStonketh RevisionOrigin: 87763d1 Test Merge Updated @ 06/19/2025 04:36:17 +00:00:Server InstancePVECM: Green Merged ByStinkethStonketh RevisionOrigin: 87763d1 Test Merge Removed @ 06/19/2025 10:07:40 +00:00:Server InstancePVECM: Green Test Merge Deployed @ 06/20/2025 10:31:44 +00:00:Server InstancePVECM: Green Merged BySpartanBobby RevisionOrigin: 3ee4d1c Test Merge Removed @ 06/20/2025 16:36:00 +00:00:Server InstancePVECM: Green Test Merge Deployed @ 06/21/2025 09:31:38 +00:00:Server InstancePVECM: Green Merged BySpartanBobby RevisionOrigin: abd3b29 Test Merge Updated @ 06/21/2025 13:22:37 +00:00:Server InstancePVECM: Green Merged ByWarfan RevisionOrigin: abd3b29 Test Merge Updated @ 06/21/2025 15:40:05 +00:00:Server InstancePVECM: Green Merged Byshorttemperedleprech RevisionOrigin: abd3b29 Test Merge Updated @ 06/21/2025 20:10:21 +00:00:Server InstancePVECM: Green Merged BySpartanBobby RevisionOrigin: abd3b29 Test Merge Updated @ 06/22/2025 06:07:24 +00:00:Server InstancePVECM: Green Merged ByEmilitia Ennehrt RevisionOrigin: abd3b29 Test Merge Updated @ 06/22/2025 11:53:01 +00:00:Server InstancePVECM: Green Merged ByKarmac RevisionOrigin: abd3b29 Test Merge Updated @ 06/22/2025 15:23:12 +00:00:Server InstancePVECM: Green Merged BySpartanBobby RevisionOrigin: abd3b29 Test Merge Updated @ 06/22/2025 16:01:32 +00:00:Server InstancePVECM: Green Merged BySpartanBobby RevisionOrigin: abd3b29 Test Merge Updated @ 06/22/2025 20:16:52 +00:00:Server InstancePVECM: Green Merged BySpartanBobby RevisionOrigin: 4b4cd05 Test Merge Removed @ 06/23/2025 14:27:06 +00:00:Server InstancePVECM: Green Test Merge Deployed @ 06/23/2025 21:35:00 +00:00:Server InstancePVECM: Green Merged BySpartanBobby RevisionOrigin: e6c14d5 Test Merge Updated @ 06/23/2025 21:46:44 +00:00:Server InstancePVECM: Green Merged BySpartanBobby RevisionOrigin: e6c14d5 Test Merge Updated @ 06/23/2025 22:01:23 +00:00:Server InstancePVECM: Green Merged BySpartanBobby RevisionOrigin: e6c14d5 Test Merge Updated @ 06/24/2025 06:15:15 +00:00:Server InstancePVECM: Green Merged ByEmilitia Ennehrt RevisionOrigin: e6c14d5 Test Merge Removed @ 06/24/2025 12:39:22 +00:00:Server InstancePVECM: Green Test Merge Deployed @ 06/25/2025 09:33:23 +00:00:Server InstancePVECM: Green Merged ByKarmac RevisionOrigin: e6c14d5 Test Merge Removed @ 06/25/2025 16:08:31 +00:00:Server InstancePVECM: Green Test Merge Deployed @ 06/25/2025 20:34:45 +00:00:Server InstancePVECM: Green Merged BySpartanBobby RevisionOrigin: e6c14d5 Test Merge Updated @ 06/25/2025 21:01:53 +00:00:Server InstancePVECM: Green Merged BySpartanBobby RevisionOrigin: e6c14d5 Test Merge Updated @ 06/26/2025 00:32:28 +00:00:Server InstancePVECM: Green Merged ByRob606 RevisionOrigin: e6c14d5 Test Merge Updated @ 06/26/2025 00:48:41 +00:00:Server InstancePVECM: Green Merged ByRob606 RevisionOrigin: e6c14d5 Test Merge Updated @ 06/27/2025 04:10:48 +00:00:Server InstancePVECM: Green Merged BySpartanBobby RevisionOrigin: e6c14d5 Test Merge Deployed @ 06/27/2025 11:09:12 +00:00:Server InstancePVECM: Red Merged ByMessageCypher RevisionOrigin: e6c14d5 Test Merge Removed @ 06/27/2025 17:28:02 +00:00:Server InstancePVECM: Green Test Merge Removed @ 06/29/2025 22:48:46 +00:00:Server InstancePVECM: Red Test Merge Deployed @ 06/30/2025 14:18:54 +00:00:Server InstancePVECM: Green Merged ByKarmac RevisionOrigin: 5d6f309 Test Merge Updated @ 06/30/2025 14:22:16 +00:00:Server InstancePVECM: Green Merged ByKarmac RevisionOrigin: 5d6f309 Test Merge Removed @ 06/30/2025 18:11:24 +00:00:Server InstancePVECM: Green Test Merge Deployed @ 06/30/2025 19:41:47 +00:00:Server InstancePVECM: Red Merged Bylordloko RevisionOrigin: 5d6f309 Test Merge Updated @ 06/30/2025 19:50:37 +00:00:Server InstancePVECM: Red Merged Bylordloko RevisionOrigin: 5d6f309 Test Merge Updated @ 06/30/2025 20:06:10 +00:00:Server InstancePVECM: Red Merged Bylordloko RevisionOrigin: 5d6f309 Test Merge Deployed @ 06/30/2025 23:11:28 +00:00:Server InstancePVECM: Green Merged ByRob606 RevisionOrigin: 5d6f309 Test Merge Updated @ 06/30/2025 23:17:11 +00:00:Server InstancePVECM: Green Merged ByRob606 RevisionOrigin: 5d6f309 Test Merge Removed @ 06/30/2025 23:36:38 +00:00:Server InstancePVECM: Green Test Merge Removed @ 07/01/2025 03:00:10 +00:00:Server InstancePVECM: Red Test Merge Deployed @ 07/01/2025 12:50:38 +00:00:Server InstancePVECM: Red Merged Bylordloko RevisionOrigin: 9a7b5d4 Test Merge Removed @ 07/02/2025 02:43:08 +00:00:Server InstancePVECM: Red |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
# Conflicts: # code/global.dm
Conflicts have been resolved. A maintainer will review the pull request shortly. |
# Conflicts: # code/__DEFINES/__game.dm # code/modules/cm_marines/equipment/maps.dm # map_config/maps.txt
the north bunker, next to CIC - if the APC is damaged it can't be repaired - per a player |
About the pull request
Berserk OST - Murder (extended)
Remember: something that is self-evident to you might not be to others. Explain your rationale fully, even if you feel it goes without saying. -->
Explain why it's good for the game
Berserk OST - Murder (extended)
Testing Photographs and Procedure
Screenshots & Videos
Put screenshots and videos here with an empty line between the screenshots and the
<details>
tags.Changelog
🆑SpartanBobby
mapadd: Berserk OST - Murder (extended)
/:cl: