cmss13 icon indicating copy to clipboard operation
cmss13 copied to clipboard
verified publisher icon cmss13-devs

IASF insert & Hybrisa changes & Fixes.

Open Zenith00000 opened this issue 8 months ago • 12 comments

About the pull request

This PR adds two new inserts - Mainly the IASF insert + Survivors. It also removes the CLF insert and replaces it with a more expansive and unique insert at the WY-space-port.

The IASF (Imperial Armed Space Force) are basically a Paratrooper regiment. They have the same team dynamic as the other inserts, PMC, Trijent UPP ect. Only they also include a CO, and instead of a spec they have a Pilot role.

I've also took the time to fix many minor things on Hybrisa, including revamping the insert made by Steelpoint and such, as there were a few minor issues with it too.

I've added a few new armors, helmets and fitting TWE themed gear for the IASF, as well as added the L54 pistol to the NSAP - ported from PvE, and a few new special variants of it. Things like custom belts, webbing and various other misc things as well.

Explain why it's good for the game

More content, more interesting inserts and situations to be had, more TWE themed stuff as we're lacking it. As well as fixing many little issues with Hybrisa in general, mostly very minor stuff.

Testing Photographs and Procedure

Screenshots & Videos

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

IASF team -

IASF

IASF - Outpost Souter - Survivor spawn 68747470733a2f2f616666656374656461726330372e626c6f622e636f72652e77696e646f77732e6e65742f6d6462322f696d616765732f3336363937393335372f34303735383730353234342f612f6d6170735f6d61705f66696c65735f4c563735395f487962726 (1)

IASF - Outpost Souter - regular round spawn - empty

68747470733a2f2f616666656374656461726330372e626c6f622e636f72652e77696e646f77732e6e65742f6d6462322f696d616765732f3336363937393335372f34303735383730353234342f6d2f6d6170735f6d61705f66696c65735f4c563735395f4879627269736

CLF space-port insert

68747470733a2f2f616666656374656461726330372e626c6f622e636f72652e77696e646f77732e6e65742f6d6462322f696d616765732f3336363937393335372f34303735383730353234342f612f6d6170735f6d61705f66696c65735f4c563735395f4879627269736

Changelog

:cl: Zenith, BOBAMA, vandujr add: added the IASF survivors to the Outpost Souter insert add: added the L54 service pistol & two (custom) variants fix: fixed RMC boots pathing fix: fixed Scout cloak on urban maps mapadd: replaces the current CLF insert with a new one at the wy-space-port. maptweak: many fixes and small changes across Hybrisa. maptweak: revamped/fixed up Steelpoints IASF insert. maptweak: revamped/fixed up the CLF insert, now it spawns at the space-port north-west. /:cl:

Zenith00000 avatar Apr 14 '25 12:04 Zenith00000

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

cm13-github avatar Apr 14 '25 12:04 cm13-github

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

cm13-github avatar Apr 14 '25 13:04 cm13-github

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

cm13-github avatar Apr 20 '25 22:04 cm13-github

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

cm13-github avatar Apr 21 '25 00:04 cm13-github

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

cm13-github avatar Apr 22 '25 23:04 cm13-github

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

cm13-github avatar Apr 23 '25 17:04 cm13-github

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

cm13-github avatar May 12 '25 23:05 cm13-github

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

cm13-github avatar May 13 '25 00:05 cm13-github

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

cm13-github avatar May 20 '25 04:05 cm13-github

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

cm13-github avatar May 20 '25 05:05 cm13-github

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

cm13-github avatar May 23 '25 19:05 cm13-github

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

cm13-github avatar May 23 '25 21:05 cm13-github

Test merge deployment history:

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

CM13 Live

Revision

Origin: c35a1e09e03e3920e499ec553cecaddc9e0aa7e2 Pull Request: c75fe6b1b4b7b84a14c16caf5768af2ea544467b Server: 3783ace2be11df57aeb2036119198bacaeb02e44

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

CM13 Live

Revision

Origin: 15f03a4d6e48507ea4bbf6bf79c83062ca16228b Pull Request: c75fe6b1b4b7b84a14c16caf5768af2ea544467b Server: b30df196e475c3c81416a7934aa05c8a84035cd7

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

CM13 Live

Revision

Origin: c0c35113edc803e5c64ac2b48a85710cc11df907 Pull Request: c75fe6b1b4b7b84a14c16caf5768af2ea544467b Server: 8b8d75979ff21a92124d3481553295803e935b64

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

CM13 Live

Revision

Origin: 607e27d5351ee11c9777dd330d7f4c7973b0bb63 Pull Request: c75fe6b1b4b7b84a14c16caf5768af2ea544467b Server: f4a34cbba456f67844e3dead00a822f3a0563ce4

Test Merge Updated @ 05/26/2025 02:13:44 +00:00:
Server Instance

CM13 Live

Revision

Origin: 2378f2a275967bfb171983d84ba2d0d0945dd9fd Pull Request: c75fe6b1b4b7b84a14c16caf5768af2ea544467b Server: eb5e165956bb2d586d30e55285e12ee185bc7371

Test Merge Updated @ 05/26/2025 14:18:03 +00:00:
Server Instance

CM13 Live

Revision

Origin: 89076d68454902c729db902e59de3afd4afb5ba2 Pull Request: c75fe6b1b4b7b84a14c16caf5768af2ea544467b Server: adbbc73897e82570de5c0f489be3d2ce48b3fdef

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

CM13 Live

Revision

Origin: 77ea7e071e5b9a25b054c9af8f2869cb29cd5f66 Pull Request: c75fe6b1b4b7b84a14c16caf5768af2ea544467b Server: eda9cca7966925cf6d2cc0587af4657de307582c

Test Merge Updated @ 05/26/2025 16:19:59 +00:00:
Server Instance

CM13 Live

Revision

Origin: dd2e2af5588ede86e232fa6dc601c2e32906f425 Pull Request: c75fe6b1b4b7b84a14c16caf5768af2ea544467b Server: 525e3277906656d2800c891fea997adc42841458

Test Merge Updated @ 05/26/2025 17:20:56 +00:00:
Server Instance

CM13 Live

Revision

Origin: 67a5b225bf8a9f6937f5b977297de39588a7601b Pull Request: c75fe6b1b4b7b84a14c16caf5768af2ea544467b Server: f754a3a021183294fb4fc215f3987021b58a2a43

Test Merge Updated @ 05/26/2025 22:10:38 +00:00:
Server Instance

CM13 Live

Revision

Origin: 0984647cd8706f97d5ff0ed1ee1add1b5aeec39a Pull Request: c75fe6b1b4b7b84a14c16caf5768af2ea544467b Server: 41a7c225a7318448289a9d0b7c8290b43c904232

Test Merge Updated @ 05/27/2025 02:12:53 +00:00:
Server Instance

CM13 Live

Revision

Origin: 68db9e0bc11dc9fe121bb4f95165e65df272e3c8 Pull Request: c75fe6b1b4b7b84a14c16caf5768af2ea544467b Server: ed7d315bcad62ed2dc31441b49db7cba4e6bcf7a

Test Merge Updated @ 05/27/2025 02:52:09 +00:00:
Server Instance

CM13 Live

Revision

Origin: 614e3842bc520c6095bea5eeb7523c2648916e30 Pull Request: 0d093c3a7a237ffc73bccfc10870376b4c7cbfa5 Server: b897042b1e62ea49a7c5e8aa98c05047fa7a8a34

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

CM13 Live

Revision

Origin: 614e3842bc520c6095bea5eeb7523c2648916e30 Pull Request: 0d093c3a7a237ffc73bccfc10870376b4c7cbfa5 Server: 49a234186559231e6ba38d247295be291b9bedbf

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

CM13 Live

Revision

Origin: c892a2940509a8f9f48402f3bd1ec9be11f74822 Pull Request: 0d093c3a7a237ffc73bccfc10870376b4c7cbfa5 Server: 43e6b6e1eac2423287e90293f807205611eccc5c

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

CM13 Live

Revision

Origin: f1e4fcc1dea8257a40114c58722fbda394c0f5e5 Pull Request: 0d093c3a7a237ffc73bccfc10870376b4c7cbfa5 Server: abed4e0b191e3fb04f4fc91784fbb218173762b4

Test Merge Updated @ 05/27/2025 17:48:30 +00:00:
Server Instance

CM13 Live

Revision

Origin: f1e4fcc1dea8257a40114c58722fbda394c0f5e5 Pull Request: 0d093c3a7a237ffc73bccfc10870376b4c7cbfa5 Server: 7f1107ca0e3fc8466f176ec04c670f8c9ada99cb

Test Merge Removed @ 05/27/2025 18:04:56 +00:00:
Server Instance

CM13 Live

Test Merge Deployed @ 06/14/2025 17:28:23 +00:00:
Server Instance

CM13 Live

Revision

Origin: a99872d1b4ea5cbfd7f15bf4ced0b53598ed4af6 Pull Request: 958a157d1e8dc0ea8b62ea3c07b6f8bcf7f84a86 Server: 91eb7d0e7b2cb25a49a4328174b1c2e36316ce28

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

CM13 Live

Revision

Origin: a472182a2fcdad02d1b5803ae5d20d19b3d86242 Pull Request: 958a157d1e8dc0ea8b62ea3c07b6f8bcf7f84a86 Server: ab9a4b28ee83a6212d80055d9568849ce64bdc5c

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

CM13 Live

Revision

Origin: a472182a2fcdad02d1b5803ae5d20d19b3d86242 Pull Request: 958a157d1e8dc0ea8b62ea3c07b6f8bcf7f84a86 Server: 5527d38ba73a14d4ec68c967f966a77b4718b7ba

Test Merge Removed @ 06/15/2025 01:13:32 +00:00:
Server Instance

CM13 Live

cm13-github avatar May 25 '25 10:05 cm13-github

TMO while it has temporary values.

Drulikar avatar May 27 '25 02:05 Drulikar

TMO while it has temporary values.

fixed in latest commit, removing tmo

Nanu308 avatar May 27 '25 20:05 Nanu308

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

cm13-github avatar May 29 '25 16:05 cm13-github

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

cm13-github avatar May 30 '25 00:05 cm13-github

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

cm13-github avatar May 31 '25 09:05 cm13-github

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

cm13-github avatar May 31 '25 09:05 cm13-github

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 ~ 7 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

cmss13-ci[bot] avatar Jun 10 '25 00:06 cmss13-ci[bot]

Stale exempt until code and sprite reviewed

Drulikar avatar Jun 12 '25 19:06 Drulikar

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

cm13-github avatar Jun 13 '25 03:06 cm13-github

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

cm13-github avatar Jun 13 '25 16:06 cm13-github

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

cm13-github avatar Jun 17 '25 22:06 cm13-github

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

cm13-github avatar Jun 17 '25 23:06 cm13-github

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

cm13-github avatar Jun 20 '25 06:06 cm13-github

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

cm13-github avatar Jun 20 '25 08:06 cm13-github