USCM Chestrig #5620
Merged
USCM Chestrig #5620
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
Sprites
|
side view w/ armor is a bit hard to see, consider adjusting lighting or darker/lighter colors somewhat |
|
I am using the exact same sprites used elsewhere except removing the fuel tanks. I could alter the colour but from my brief examination the colours used are identical to pretty much every other similar chest rig sprite we use for marines. The issue seems to be that the on-mob sprites are small, but this is the issue for all similar chest rigs (see IO rig, welderpack rig, chest-welder rig, etc) |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
cm13-github
added
the
Merge Conflict
nauticall
approved these changes
Feb 4, 2024
cm13-github
removed
the
Merge Conflict
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
cm13-github
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
cm13-github
removed
the
Merge Conflict
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
Drulikar
approved these changes
Feb 6, 2024
cm13-github
added a commit
that referenced
this pull request
Feb 6, 2024
Guidesu
pushed a commit
to Guidesu/cmss13
that referenced
this pull request
Feb 10, 2024
Adds a resprite of the USCM Welder-Chestrig in the form of the USCM chestrig. An alternative to a standard satchel, same carry capacity. Alternative ways for players to customize their apperance, I also feel a chestrig feels more thematic/in universe than a satchel. In terms of balance, this has no change since the chestrig has the same inventory size as a normal satchel. <details> <summary>Screenshots & Videos</summary>  Top: Armour, No Chestrig Middle: Armour, Wearing Chestrig Bottom: No Clothing, Wearing Chestrig   </details> :cl: add: USCM Chestrig has been added to squad prep vendors, alternative sprite of a satchel, similar in appearance to the welder-chestrig. /:cl: Co-authored-by: Steelpoint <[email protected]>
github-merge-queue bot
pushed a commit
that referenced
this pull request
Mar 11, 2024
# About the pull request This PR is a follow up to #5620 setting the setting required to indicate it doesn't have map specific skins (e.g. Shiva) # Explain why it's good for the game Fixes #5910 # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary>  </details> # Changelog :cl: Drathek fix: Fix chestrig not displaying on maps with different skins (e.g. Shivas) /:cl:
Johannes2262
added a commit
to Johannes2262/cmss13
that referenced
this pull request
Mar 12, 2024
commit 4bcec77 Author: cm13-github <[email protected]> Date: Tue Mar 12 12:51:03 2024 +0000 Automatic changelog for PR cmss13-devs#5901 [ci skip] commit 1c2ad76 Author: Segrain <[email protected]> Date: Tue Mar 12 16:44:40 2024 +0400 Fixes for medals. (cmss13-devs#5901) # About the pull request By design, you cannot wear uniform/armour with somebody else's medal. Fine, but let it be checked upon trying to don the bemedalled object yourself, not upon simply picking it up from the ground. It is frustrating to constantly drop medals when trying to rearmour your patients after revival/surgery. (Ceterum censeo, letting doctors call themselves surgeons adds nothing but an excuse to shirk pharmacy duties and to pretend to have priority for deployment. But a bug is a bug.) # Explain why it's good for the game Is fixes. # Changelog 🆑 fix: Picking up clothes/armour with somebody else's medal attached no longer makes the medal fall off (trying to wear them still does). fix: Doctors calling themselves surgeons now properly get playtime medals. fix: Playtime medals now use assignments instead of backend paygrade codes (e.g. "Awarded to Squad Leader John Doe" instead of "Awarded to ME5 John Doe"). /🆑 commit 4822bbd Author: Changelogs <[email protected]> Date: Tue Mar 12 01:07:18 2024 +0000 Automatic changelog compile [ci skip] commit c7abb8d Author: cm13-github <[email protected]> Date: Tue Mar 12 00:55:46 2024 +0000 Automatic changelog for PR cmss13-devs#5510 [ci skip] commit 02350b6 Author: forest2001 <[email protected]> Date: Tue Mar 12 00:48:53 2024 +0000 Project ARES: Ticket Notifications (cmss13-devs#5510) # About the pull request Adds audio notifications for certain ticket interactions, played from APOLLO consoles and WJ PDAs. <!-- Remove this text and explain what the purpose of your PR is. Mention if you have tested your changes. If you changed a map, make sure you used the mapmerge tool. If this is an Issue Correction, you can type "Fixes Issue #169420" to link the PR to the corresponding Issue number #169420. 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 # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog 🆑 soundadd: Added pda_ping.ogg, sourced from Paradise SS13 mailapproved.ogg add: Added notification sounds from certain APOLLO ticket interactions. add: People making an access ticket request are now notified of the status changes. /🆑 --------- Co-authored-by: Drathek <[email protected]> commit 135e111 Author: cm13-github <[email protected]> Date: Mon Mar 11 20:44:50 2024 +0000 Automatic changelog for PR cmss13-devs#5902 [ci skip] commit 80a989c Author: Staykeu <[email protected]> Date: Mon Mar 11 16:38:18 2024 -0400 Drop Pouch Buff (cmss13-devs#5902) # About the pull request The intention behind this PR is to see the drop pouch used more often as a middle ground between the magazine webbing and large webbing. Adds two more small item spaces (one medium item space). The drop pouch carries either two large items (unchanged), four medium sized items, or eight small items. <!-- Remove this text and explain what the purpose of your PR is. Mention if you have tested your changes. If you changed a map, make sure you used the mapmerge tool. If this is an Issue Correction, you can type "Fixes Issue #169420" to link the PR to the corresponding Issue number #169420. 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 The drop pouch is rarely ever used, mostly by smartgunners who need a few extra drums. This should change that. It brings the drop pouch up from a niche "(worse) large pouch but for your webbing slot" to a middler between the magazine webbing and large webbing, mag webbing is still better for packing mags, like it always has been, and large webbing is still better for packing medium sized items, which are most of the items a marine would be packing. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog 🆑 Stakeyng balance: Drop pouch has more space (2 large (unchanged), 4 medium, 8 small) /🆑 --------- Co-authored-by: private-tristan <[email protected]> commit f2e1761 Author: cm13-github <[email protected]> Date: Mon Mar 11 20:30:59 2024 +0000 Automatic changelog for PR cmss13-devs#5904 [ci skip] commit f85a7bf Author: Katskan <[email protected]> Date: Mon Mar 11 16:15:37 2024 -0400 Adjust Medical Skill Duration Multiplier (cmss13-devs#5904) # About the pull request Adjusts medical skill level to be more incremental and based on proficiency and familiarity with the tools, as such Medical 4 doesn't get speed bonus out of nowhere, being preceded by Medical 3 giving a lower bonus and then Medical 4 getting a larger bonus. Also reduces the raw bonus of Medical 4 so that you no longer have the issue with defibrillators shocking before they're done charging. # Explain why it's good for the game Makes medical skill make some more sense in how it progresses, also gives a little bump to the majority of higher medical roles which have Medical 3. Because it doesn't touch Medical 2, shouldn't impact front line dynamics much if at all. # Testing Photographs and Procedure Ran on local machine for testing. # Changelog Spoke with Drathek King Of Balance prior to posting PR 🆑 balance: Medical Skill 4 reduced speed buff from -75% duration to -50% duration balance: Medical Skill 3 increased speed buff from -0% duration to -25% duration /🆑 commit 3ff60e3 Author: cm13-github <[email protected]> Date: Mon Mar 11 20:22:44 2024 +0000 Automatic changelog for PR cmss13-devs#5917 [ci skip] commit e6aeb40 Author: ihatethisengine <[email protected]> Date: Mon Mar 11 23:15:19 2024 +0300 Dropship doors can now always be broken by queen (cmss13-devs#5917) # About the pull request This PR is a follow up to cmss13-devs#5808 removing a locked check to break the doors. # Explain why it's good for the game Now regardless of currently locked or open, the queen can break the doors to prevent further door spamming. <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog 🆑 ihatethisengine2 fix: Dropship door prying can now always be performed by queen even if open or not locked /🆑 --------- Co-authored-by: Drathek <[email protected]> commit 19e7779 Author: cm13-github <[email protected]> Date: Mon Mar 11 17:27:24 2024 +0000 Automatic changelog for PR cmss13-devs#5900 [ci skip] commit 87ea79f Author: Segrain <[email protected]> Date: Mon Mar 11 21:20:41 2024 +0400 Spare medical/engineering radios. (cmss13-devs#5900) # About the pull request May the medical survivors rejoice. # Explain why it's good for the game Ever since somebody decided that half the shipside roles should be spawning without headsets at all, there is no way for a doctor/researcher that survives and gets to Almayer to actually get a functional radio. Time to fix that. (Also removed a thing that should have been gone long ago. You know who you are and what have you done.) # Changelog 🆑 add: Requisitions' vendor now has medical radio keys in stock. add: CE and CMO can now get spare departmental headsets from their vendors to recruit survivors without having to go to Requisitions. /🆑 --------- Co-authored-by: Zonespace <[email protected]> commit 268eb4b Author: cm13-github <[email protected]> Date: Mon Mar 11 11:59:17 2024 +0000 Automatic changelog for PR cmss13-devs#5898 [ci skip] commit d3e5812 Author: Segrain <[email protected]> Date: Mon Mar 11 15:54:04 2024 +0400 Fix for empty lists of frequencies. (cmss13-devs#5898) # About the pull request Followup to cmss13-devs#5833. First I thought that I had simply fumbled back then by fixing things enough that breaking them actually works now and fixing it is simply a matter of making the list empty itself instead of replacing itself with a null so that trying to `|=` to it no longer would runtime. And then I discovered that somebody once had decided that the syntax to declare comms machines as universal shall be by giving them empty frequency lists. Please never do that. It is a pain to track which cases are intended to be empty because they are meant to be universal and which are intended to be empty because they will be filled via some procedure. I _think_ that I sorted them correctly, but if something will break again, more fixing will need doing. # Explain why it's good for the game Is fix. # Changelog 🆑 fix: Wiping frequencies off radiotowers no longer breaks them forever. /🆑 commit 111f650 Author: cm13-github <[email protected]> Date: Mon Mar 11 11:30:45 2024 +0000 Automatic changelog for PR cmss13-devs#5911 [ci skip] commit ae6a2e8 Author: Drathek <[email protected]> Date: Mon Mar 11 04:23:57 2024 -0700 Fix chestrig expecting map skins (cmss13-devs#5911) # About the pull request This PR is a follow up to cmss13-devs#5620 setting the setting required to indicate it doesn't have map specific skins (e.g. Shiva) # Explain why it's good for the game Fixes cmss13-devs#5910 # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary>  </details> # Changelog 🆑 Drathek fix: Fix chestrig not displaying on maps with different skins (e.g. Shivas) /🆑 commit 24a1538 Author: Changelogs <[email protected]> Date: Mon Mar 11 01:07:59 2024 +0000 Automatic changelog compile [ci skip] commit 19d20a8 Author: cm13-github <[email protected]> Date: Sun Mar 10 16:56:46 2024 +0000 Automatic changelog for PR cmss13-devs#5897 [ci skip] commit 4c17176 Author: Segrain <[email protected]> Date: Sun Mar 10 20:50:36 2024 +0400 Fix for answering marked tickets. (cmss13-devs#5897) # About the pull request Followup to cmss13-devs#5872. Should have searched through all the files instead of only one to begin withal. # Explain why it's good for the game Is fix. # Changelog 🆑 admin: Actually fixed the last case of being warned against interacting with ticket already marked by you. /🆑 commit 499d157 Author: Changelogs <[email protected]> Date: Sat Mar 9 01:04:24 2024 +0000 Automatic changelog compile [ci skip] commit 43b5afb Author: cm13-github <[email protected]> Date: Fri Mar 8 22:34:06 2024 +0000 Automatic changelog for PR cmss13-devs#5890 [ci skip] commit 4b6139c Author: iloveloopers <[email protected]> Date: Fri Mar 8 18:27:28 2024 -0400 buffs ravager empower (cmss13-devs#5890) # About the pull request empower range increased to 4 # Explain why it's good for the game cmss13-devs#3729 nerfed base rav too much, rav does not have great armor (only 25) which means it has to rely alot on shields gained for sustain. it also increased the max targets from 5 to 6 but didn't give any empower range, its very rare to actually be able to get the full 6 targets. # Testing Photographs and Procedure its a numbers change # Changelog 🆑 balance: ravager empower range is now 4 tiles /🆑 commit 6b731c7 Author: cm13-github <[email protected]> Date: Fri Mar 8 15:20:22 2024 +0000 Automatic changelog for PR cmss13-devs#5892 [ci skip] commit 78fe2df Author: Drathek <[email protected]> Date: Fri Mar 8 07:13:40 2024 -0800 Fix LateInitialize not occurring for poddoors for relativewall_neighbours (cmss13-devs#5892) # About the pull request This PR is a followup to cmss13-devs#5821 where I forgot to check if LateInitialize was occurring since it requires a hint to do so. Previously they would call the proc after a timer, but it made more sense to do so in LateInitialize. However, I am not able to find anywhere this even visually has any effect so I'm not sure its necessary for the doors to be calling `relativewall_neighbours`. # Explain why it's good for the game Fixes dead code. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog 🆑 Drathek fix: Fix pod doors no longer updating adjacent tiles /🆑
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the pull request
Adds a resprite of the USCM Welder-Chestrig in the form of the USCM chestrig. An alternative to a standard satchel, same carry capacity.
Explain why it's good for the game
Alternative ways for players to customize their apperance, I also feel a chestrig feels more thematic/in universe than a satchel. In terms of balance, this has no change since the chestrig has the same inventory size as a normal satchel.
Testing Photographs and Procedure
Screenshots & Videos
Top: Armour, No Chestrig
Middle: Armour, Wearing Chestrig
Bottom: No Clothing, Wearing Chestrig
Changelog
🆑
add: USCM Chestrig has been added to squad prep vendors, alternative sprite of a satchel, similar in appearance to the welder-chestrig.
/:cl: