8000 Dropship Airlocks by Warfan1815 · Pull Request #545 · cmss13-devs/cmss13-pve · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Dropship Airlocks #545

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 58 commits into
base: master
Choose a base branch
from
Open

Dropship Airlocks #545

wants to merge 58 commits into from

Conversation

Warfan1815
Copy link
Contributor
@Warfan1815 Warfan1815 commented Nov 10, 2024 •
edited by Drulikar
Loading

Adds dropship airlocks to the floor of the Golden Arrow hangar, which require a 5-step process to exit (very much modelled off the movie, if you would like to get a general idea of what I was going for.)
Adds a turbulence system to the dropship. When in normal flight it will occasionally shake the camera, throw unanchored items about, and floor unbuckled people (causing some damage.) When dropping out of the ship, these effects are amplified.
Changes to fz_transitions and projectors as a whole, mostly to make the effects of the airlock possible. I'm sure this might become outdated if true-z rears but for the time being its necessary.

Here's a video of it in action (w/o sound effects and with some bugs):
https://cdn.discordapp.com/attachments/1164728861766975568/1305280320404459530/2024-11-10_21-18-05.mp4?ex=67327487&is=67312307&hm=dfc45d05a3bfa5e8a83ac8f702f90024ac9a10db3aef2c38d76c37665871d472&

🆑
add: Dropship airlocks to the floor of the Golden Arrow hangar, which require a 5-step process to exit (very much modelled off the movie, if you would like to get a general idea of what I was going for.)
add: Adds a turbulence system to the dropship. When in normal flight it will occasionally shake the camera, throw unanchored items about, and floor unbuckled people (causing some damage.) When dropping out of the ship, these effects are amplified.
ui: Changed the dropship interface to include the dropship airlock buttons.
code: Added additional functionality to clones and fz_transitions, mostly the stuff that was needed to make dropship airlocks possible.
soundadd: Added new dropship activation and idle sounds.
imageadd: Added the large dropship airlock icons, and animations, along with new small hangar number icons.
mapadd: Significantly changed the Golden Arrow hangar to accommodate the dropship airlocks.
/:cl:

@cm13-github
Copy link
Contributor

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

@github-actions github-actions bot added Sprites Mapping UI Missing Changelog Maintainers always document their changes. labels Nov 10, 2024
@cm13-github
Copy link
Contributor

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

@DangerRevolution
Copy link
DangerRevolution commented Nov 15, 2024 •
edited
Loading

When a dropship returns to the Golden Arrow, it cannot engage clamps while refuelling because: "The shuttle is still recharging, it would be suicide to have it fall into the grav well." This would make sense when disengaging clamps, but not when securing the dropship to be moved to the main deck.

(The rear door also does not seem to unlock after a return to the Golden Arrow, but that might've been a GM)

@Warfan1815 Warfan1815 mentioned this pull request Feb 2, 2025
Open
@github-actions github-actions bot added Feature Code Improvement and removed Missing Changelog Maintainers always document their changes. labels Feb 2, 2025
@github-actions GitHub Actions
Copy link

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 14 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale label Feb 16, 2025
@AndroBetel AndroBetel added Stale Exempt YOU MUST CONSTRUCT ADDITIONAL MAINTAINERS and removed Stale labels Feb 21, 2025
@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.

@Warfan1815
Merge branch 'master' of https://github.com/Warfan1815/PvE-CMSS13 int…
9638f55 
…o movielike_dropships

# Conflicts:
#	code/__DEFINES/__game.dm
#	code/modules/shuttle/shuttles/dropship.dm
#	maps/map_files/golden_arrow/golden_arrow.dmm
@cm13-github
Copy link
Contributor
cm13-github commented Apr 27, 2025 •
edited
Loading

Test merge deployment history:

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

PVECM: Blue

Merged By

Wettowels

Revision

Origin: 4743cb1
Pull Request: 9638f55
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: 9638f55
Server: 7209fcc6e1f5b368ec950b41c5bdf97441f93b0c

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

PVECM: Green

Merged By

Athena14

Revision

Origin: ce83162
Pull Request: 9638f55
Server: d946b9a0fee1c49ead9295cb376ac59eb827d73c

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

PVECM: Green

Merged By

Athena14

Revision

Origin: 7a0fef0
Pull Request: 9638f55
Server: 8eb08da94c6cfa6002967975d253e88c2e730066

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

PVECM: Blue

Merged By

Merrgear

Revision

Origin: 7a0fef0
Pull Request: 9638f55
Server: aec3599bc5bee8cd6b9760a37a145a5e2c5a2f6b

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

PVECM: Blue

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

PVECM: Green

Merged By

Athena14

Revision

Origin: 7e020da
Pull Request: 9638f55
Server: bca2b377f404dfe1907ea2ef86ef2eacb025c421

Test Merge Updated @ 04/30/2025 19:05:57 +00:00:
Server Instance

PVECM: Green

Merged By

Merrgear

Revision

Origin: 7e020da
Pull Request: 9638f55
Server: 8362f877ae95cb85b717798aab70342a8ed34bf4

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

PVECM: Green

Merged By

Athena14

Revision

Origin: 7e020da
Pull Request: 9638f55
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: 9638f55
Server: babce68d6ed918ac515c1d4d4548382ca9ce43a3

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

PVECM: Green

Merged By

lordloko

Revision

Origin: 7e020da
Pull Request: 9638f55
Server: 0f4db3e61c239b08b223825140a86cda8ae92dc4

Test Merge Removed @ 05/02/2025 05:54:40 +00:00:
Server Instance

PVECM: Green

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

PVECM: Red

Merged By

Athena14

Revision

Origin: 7e020da
Pull Request: 9638f55
Server: 5e86b09b392def30d145321c7fc6eea02a8891f6

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

PVECM: Red

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

PVECM: Red

Merged By

Athena14

Revision

Origin: 7e020da
Pull Request: 9638f55
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: 9638f55
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: 9638f55
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: 9638f55
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: 9638f55
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: 9638f55
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: 9638f55
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: 9638f55
Server: 74d012034293a277a622dbbd528f8c4b84afa4a0

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

PVECM: Green

Merged By

Athena14

Revision

Origin: e522938
Pull Request: 9638f55
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: 9638f55
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: 9638f55
Server: f79efea15f0a2d4c17fba6ea8540c90632570136

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

PVECM: Red

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

PVECM: Green

Merged By

Athena14

Revision

Origin: 07f897a
Pull Request: 9638f55
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: 9638f55
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: 9638f55
Server: 57cc8423ac237586b2f250a7ea10ad005a596969

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

PVECM: Green

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

PVECM: Green

Merged By

Athena14

Revision

Origin: 45e98ff
Pull Request: 9638f55
Server: 3a109754b05c8667b688157d1b61ad2637e578b1

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

PVECM: Green

Merged By

Athena14

Revision

Origin: 45e98ff
Pull Request: 9638f55
Server: 33c9e7da50a75f1613623b78686879e03b6a4c11

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

PVECM: Green

Merged By

Warfan

Revision

Origin: a3dbcb7
Pull Request: 9638f55
Server: 804ac42c0626abce78a47eaeef601b2248dab738

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

PVECM: Blue

Merged By

The32bitguy

Revision

Origin: a3dbcb7
Pull Request: 9638f55
Server: 75fefb6a19c3c536cc84ea789b715123a781d2d3

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

PVECM: Blue

Test Merge Updated @ 05/19/2025 02:32:27 +00:00:
Server Instance

PVECM: Green

Merged By

EmiSol

Revision

Origin: c33d5a0
Pull Request: c3ea008 67ED
Server: 3173c6de60cf19aed16ec523515b14ef7d828ae2

Test Merge Updated @ 05/19/2025 07:12:58 +00:00:
Server Instance

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: c33d5a0
Pull Request: c3ea008
Server: 586e36f135b93748884800d17e8a1878a9beb607

Test Merge Updated @ 05/19/2025 18:25:10 +00:00:
Server Instance

PVECM: Green

Merged By

249

Revision

Origin: c33d5a0
Pull Request: c3ea008
Server: bc688e9854e3e39658998b3de67bfe7fdcde1a66

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

PVECM: Green

Merged By

Xan

Revision

Origin: c33d5a0
Pull Request: c3ea008
Server: 8a6064ec8972d1536ff5b5397de646774b615c0b

Test Merge Removed @ 05/20/2025 05:33:13 +00:00:
Server Instance

PVECM: Green

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

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: c33d5a0
Pull Request: c3ea008
Server: 88a78d48f439753914a74b706817d61f8a1acd73

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

PVECM: Red

Merged By

Emilitia Ennehrt

Revision

Origin: c33d5a0
Pull Request: c3ea008
Server: 25236b865f5154a9ce3883ae2b6831fac5175d29

Test Merge Updated @ 05/20/2025 11:16:29 +00:00:
Server Instance

PVECM: Red

Merged By

Emilitia Ennehrt

Revision

Origin: c33d5a0
Pull Request: c3ea008
Server: 140d629c5639cb6f81cf8fe9ccb304e1d378214c

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

PVECM: Red

Merged By

Emilitia Ennehrt

Revision

Origin: c33d5a0
Pull Request: c3ea008
Server: c204269bedf9cc9f710a1aed46bc591732ef8d3e

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

PVECM: Green

Merged By

Joooks

Revision

Origin: 7136ecf
Pull Request: c3ea008
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: c3ea008
Server: e47ba20a9cad5d5216c3482dbcd7288911aeea0f

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

PVECM: Red

Merged By

AndroBetel

Revision

Origin: 7136ecf
Pull Request: c3ea008
Server: 4560c10fced29f3c65f7eb6471ca18f5b092af9e

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

PVECM: Green

Merged By

Suno

Revision

Origin: 7136ecf
Pull Request: c3ea008
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: c3ea008
Server: 1bd55ca8591fbc9280cc08054e584c0d036327c5

Test Merge Updated @ 05/21/2025 18:57:32 +00:00:
Server Instance

PVECM: Red

Merged By

Merrgear

Revision

Origin: 7136ecf
Pull Request: c3ea008
Server: ae511b533b766c5faad38aeacc472d62b858bf82

Test Merge Updated @ 05/21/2025 23:59:15 +00:00:
Server Instance

PVECM: Red

Merged By

Kirsh

Revision

Origin: 7136ecf
Pull Request: c3ea008
Server: 8fd61e1e900c7ba90d1370bac44a509616f173b4

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

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: 7136ecf
Pull Request: c3ea008
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: c3ea008
Server: cc948356549a168b687af517b76d413edf8e6b03

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

PVECM: Red

Merged By

Suno

Revision

Origin: 7136ecf
Pull Request: c3ea008
Server: fbdba23b8d33f8b406fd06b8075d4ce88288d92f

Test Merge Removed @ 05/22/2025 17:36:10 +00:00:
Server Instance

PVECM: Red

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

PVECM: Green

Merged By

Rob606

Revision

Origin: 030879c
Pull Request: c3ea008
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: c3ea008
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: c3ea008
Server: 3feb3136ee2fc5ae775b84f010d14b0fd5ce30d9

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

PVECM: Green

Merged By

Rob606

Revision

Origin: 1056165
Pull Request: c3ea008
Server: b3156d3598a9a2ab5a04627aabd368acc7349914

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

PVECM: Green

Merged By

Rob606

Revision

Origin: 1056165
Pull Request: c3ea008
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: c3ea008
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: c3ea008
Server: b6de8eea12730508e4fdb0b962a845fc8bb20cce

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

PVECM: Blue

Merged By

StinkethStonketh

Revision

Origin: 1056165
Pull Request: c3ea008
Server: 60eb7352c0a7a7df23824d5c17bf440628aeb3cf

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

PVECM: Green

Merged By

Rob606

Revision

Origin: 1056165
Pull Request: c3ea008
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: c3ea008
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: c3ea008
Server: 6b4bddb1c8fd7e1c897567a32bd7847ddafcbda6

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

PVECM: Blue

Merged By

AndroBetel

Revision

Origin: 1056165
Pull Request: c3ea008
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: c3ea008
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: c3ea008
Server: 40db7cebc0957172b8dab28b5c8e2940867a3341

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

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: 1c66ba4
Pull Request: c3ea008
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: c3ea008
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: c3ea008
Server: d3d6950aaa68ae570f6fdf420b0a6f8ca61d001c

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

PVECM: Blue

Test Merge Deployed @ 05/25/2025 01:42:08 +00:00:
Server Instance

PVECM: Blue

Merged By

Rob606

Revision

Origin: 1c66ba4
Pull Request: c3ea008
Server: 2d4bcc11f8612278686163f8cef07d066f32321c

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

PVECM: Green

Merged By

StinkethStonketh

Revision

Origin: 1c66ba4
Pull Request: c3ea008
Server: bacfec009c6ab31b018b9344450523ab9276cd65

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

PVECM: Blue

Merged By

StinkethStonketh

Revision

Origin: 1c66ba4
Pull Request: c3ea008
Server: aad390445b742b598315d25599b71c99831429f1

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

PVECM: Green

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

PVECM: Blue

Test Merge Deployed @ 06/08/2025 15:30:57 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: 620f2c5
Pull Request: c4b2aef
Server: 562e263f7cfb63c418415ba10eae9cfa98767abf

Test Merge Deployed @ 06/08/2025 19:43:49 +00:00:
Server Instance

PVECM: Blue

Merged By

Warfan

Revision

Origin: 620f2c5
Pull Request: c4b2aef
Server: 03a0c406d32bf6c12527b173bb64101ddb41ffbd

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

PVECM: Blue

Merged By

Karmac

Revision

Origin: 620f2c5
Pull Request: c4b2aef
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: c4b2aef
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: c4b2aef
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: c4b2aef
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: c4b2aef
Server: 0a754cb5ae15e33f3f33ba649a4502e02a0a004c

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

PVECM: Green

Merged By

shorttemperedleprech

Revision

Origin: 620f2c5
Pull Request: c4b2aef
Server: 0b6ccbd33db86cecbde12da05c4a03ff61ae1321

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

PVECM: Blue

Test Merge Removed @ 06/11/2025 00:39:33 +00:00:
Server Instance

PVECM: Green

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

PVECM: Green

Merged By

Joooks

Revision

Origin: 620f2c5
Pull Request: c4b2aef
Server: c08687c7f25a8ce4e6c2d8d141846ce767f5049a

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

PVECM: Green

Test Merge Deployed @ 06/13/2025 15:53:59 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: 99b8e3d
Pull Request: c4b2aef
Server: cf650d81c76e0fe5af009d48f4df8ecb07c355e0

Test Merge Updated @ 06/13/2025 16:03:34 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: 99b8e3d
Pull Request: c4b2aef
Server: 5dd1217fc35f2902e95a0ed036e5ab1344ecbad3

Test Merge Removed @ 06/13/2025 21:44:32 +00:00:
Server Instance

PVECM: Green

Test Merge Deployed @ 06/14/2025 05:36:40 +00:00:
Server Instance

PVECM: Green

Merged By

Karmac

Revision

Origin: 99b8e3d
Pull Request: c4b2aef
Server: 0d599090b1a98be7be066c98b0df8ebf3f97a265

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

PVECM: Green

Merged By

Karmac

Revision

Origin: 1081311
Pull Request: c4b2aef
Server: a3c8efc72fe841593875e9b53f3d267a51d4ec4f

Test Merge Updated @ 06/14/2025 19:40:47 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: 1081311
Pull Request: c4b2aef
Server: f99ed96d7d33047733de38f075f982fbf4c49f4e

Test Merge Removed @ 06/14/2025 19:50:38 +00:00:
Server Instance

PVECM: Green

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

PVECM: Green

Merged By

Karmac

Revision

Origin: 1081311
Pull Request: c4b2aef
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: c4b2aef
Server: 6a69fd99554d603fb1a31f3cddde987f5be09d41

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

PVECM: Green

Test Merge Deployed @ 06/15/2025 21:59:47 +00:00:
Server Instance

PVECM: Green

Merged By

alanparkermasters

Revision

Origin: 1081311
Pull Request: c4b2aef
Server: 63932f028df473b9d94e04ce77c7a39fdecf1d06

Test Merge Updated @ 06/16/2025 02:06:51 +00:00:
Server Instance

PVECM: Green

Merged By

Karmac

Revision

Origin: 1081311
Pull Request: c4b2aef
Server: eae7efa8aa64d492f221ec7a5812adbe89f85cc9

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

PVECM: Green

Merged By

twizzums

Revision

Origin: 4652094
Pull Request: c4b2aef
Server: 9084499fc911e6cfdd3faa875ec5d40d7f4c4e55

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

PVECM: Green

Merged By

StinkethStonketh

Revision

Origin: 91b90b6
Pull Request: c4b2aef
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: c4b2aef
Server: 56390cb80f724904605de298a4ccd432c6a9206a

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

PVECM: Green

Merged By

Karmac

Revision

Origin: 91b90b6
Pull Request: c4b2aef
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: c4b2aef
Server: b0711c0043398847f3bf292244c8c318b7dfd160

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

PVECM: Green

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

PVECM: Green

Merged By

Karmac

Revision

Origin: 87763d1
Pull Request: c4b2aef
Server: b0776a35fdeff0068715b5827e4a1613490c6599

Test Merge Removed @ 06/18/2025 13:43:15 +00:00:
Server Instance

PVECM: Green

Test Merge Deployed @ 06/19/2025 04:11:33 +00:00:
Server Instance

PVECM: Green

Merged By

StinkethStonketh

Revision

Origin: 87763d1
Pull Request: c4b2aef
Server: 54185df7ec546761f01df7c07d16345aaae141c9

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

PVECM: Green

Merged By

StinkethStonketh

Revision

Origin: 87763d1
Pull Request: c4b2aef
Server: 0d634f2a37fbb85311c701ec0559d0fde5547759

Test Merge Removed @ 06/19/2025 10:07:40 +00:00:
Server Instance

PVECM: Green

Test Merge Deployed @ 06/19/2025 22:00:15 +00:00:
Server Instance

PVECM: Green

Merged By

alanparkermasters

Revision

Origin: 3ee4d1c
Pull Request: c4b2aef
Server: 0700500913ea621e528e2cb27b8c22df64482ad9

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

PVECM: Red

Merged By

Xan

Revision

Origin: 3ee4d1c
Pull Request: c4b2aef
Server: 9d0acba4a88f5609c3336dbd1211a00c84e66977

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

PVECM: Green

Test Merge Removed @ 06/20/2025 13:15:30 +00:00:
Server Instance

PVECM: Red

Test Merge Deployed @ 06/20/2025 18:19:51 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: 6164265
Pull Request: c4b2aef
Server: ea2bcf2a3bca4c03bc6bf72fde5baec3be66dfee

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

PVECM: Green

Merged By

Joooks

Revision

Origin: 6164265
Pull Request: c4b2aef
Server: b33fc2d211ef6a439c2a0eb303e4903d2da247fc

Test Merge Removed @ 06/21/2025 01:25:54 +00:00:
Server Instance

PVECM: Green

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

PVECM: Blue

Merged By

Warfan

Revision

Origin: abd3b29
Pull Request: 9cffd17
Server: 461e36948e1b26b1a7317facab05d947d2a533a3

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

PVECM: Red

Merged By

Warfan

Revision

Origin: abd3b29
Pull Request: 9cffd17
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: 9cffd17
Server: 2a543be0c4c6c6bea04efe0516b3d9e41d80f711

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

PVECM: Green

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

PVECM: Red

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

PVECM: Green

Merged By

Karmac

Revision

Origin: abd3b29
Pull Request: 9cffd17
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: 9cffd17
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: 9cffd17
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: 9cffd17
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: 9cffd17
Server: 0f91a6904b3ed8629ee037d73016a20454f7237f

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

PVECM: Green

Test Merge Deployed @ 06/24/2025 21:22:12 +00:00:
Server Instance

PVECM: Green

Merged By

goshflipheck

Revision

Origin: e6c14d5
Pull Request: 9cffd17
Server: c85f96f1ba932f5ba645df3f30c34c0ea9873ac7

Test Merge Updated @ 06/25/2025 05:49:14 +00:00:
Server Instance

PVECM: Green

Merged By

goshflipheck

Revision

Origin: e6c14d5
Pull Request: 9cffd17
Server: 80874c46d7817832c1e59972fb13d21b0277ef14

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

PVECM: Green

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

PVECM: Green

Merged By

Joooks

Revision

Origin: e6c14d5
Pull Request: 9cffd17
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: 9cffd17
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: 9cffd17
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: 9cffd17
Server: 6d5a6ed4fb8f3ae7c05d090946249db07b2715db

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

PVECM: Green

Merged By

Rob606

Revision

Origin: e6c14d5
Pull Request: 9cffd17
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: 9cffd17
Server: 1eaaf9317c6bdc33c567eb12d1ea808765fe88b5

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

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: e6c14d5
Pull Request: 9cffd17
Server: 45e7e1debdeb6bcc2008b05e86c174a23e49384a

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

PVECM: Green

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

PVECM: Green

Merged By

Joooks

Revision

Origin: e6c14d5
Pull Request: 9cffd17
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: 9cffd17
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: 9cffd17
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: 9cffd17
Server: 2d03e8fb83358652737c399f4126e240e0e3cc60

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

PVECM: Green

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

PVECM: Green

Merged By

Emilitia Ennehrt

Revision

Origin: 5d6f309
Pull Request: 9cffd17
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: 9cffd17
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: 9cffd17
Server: 42976d02b6f76d825f31978d7ff7ca15519d14b2

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

PVECM: Green

Test Merge Deployed @ 07/02/2025 20:54:17 +00:00:
Server Instance

PVECM: Red

Merged By

Athena14

Revision

Origin: efccbe1
Pull Request: 9cffd17
Server: b31c25fc8de4cc3ca936a7eacaab4549d858a541

Test Merge Updated @ 07/02/2025 21:03:23 +00:00:
Server Instance

PVECM: Red

Merged By

Athena14

Revision

Origin: efccbe1
Pull Request: 9cffd17
Server: ee02227be3cc136a2b984650b3a27eb8029f10ae

Test Merge Removed @ 07/02/2025 22:09:40 +00:00:
Server Instance

PVECM: Red

@Yorkoh
Copy link
Contributor
Yorkoh commented May 25, 2025

can we get a GM panel toggle to turn on and off the shuttle shake? E.g. I want to use it and then stabilise so players can paradrop

@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.

Warfan1815 and others added 3 commits June 7, 2025 23:29
@Warfan1815
Merge branch 'master' of https://github.com/Warfan1815/PvE-CMSS13 int…
d9bc961 
…o movielike_dropships

# Conflicts:
#	maps/map_files/golden_arrow/golden_arrow.dmm
@Warfan1815
Fixup maps in TGM format
c4b2aef 
c0d8100: maps/map_files/golden_arrow/golden_arrow.dmm
c0d8100: maps/shuttles/dropship_midway.dmm

Automatically commited by: tools\mapmerge2\fixup.py
@Warfan1815
Merge branch 'master' into movielike_dropships
9cffd17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fira fira Awaiting requested review from fira fira is a code owner

Assignees
No one assigned
Labels
Code Improvement Feature Mapping Sound Sprites Stale Exempt YOU MUST CONSTRUCT ADDITIONAL MAINTAINERS UI
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Warfan1815 @cm13-github @DangerRevolution @Yorkoh @AndroBetel
0