Skip to content
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

EE Merge 02/21/24 #274

Merged
merged 26 commits into from
Feb 21, 2025
Merged

EE Merge 02/21/24 #274

merged 26 commits into from
Feb 21, 2025

Conversation

sleepyyapril
Copy link
Contributor

@sleepyyapril sleepyyapril commented Feb 21, 2025

🆑 EE Contributors

  • tweak: Made Muted give sign language
  • tweak: Blacklisted muted characters from taking sign language (because it gives them it)
  • fix: Blacklisted muted characters from taking Singer or Lyrebird
  • fix: Fixed the singulo leaping out of containment.
  • tweak: Humans now have a larger variety of ears
  • add: Added "Blueshield primary weapon" loadout group. The primary
    selection currently consists of the classic Chester rifle, an energy
    shield, and an R25.
  • add: Added handgun manufacturing to Arsenal research. Most firearms made this way require Aluminium mined from planets to manufacture.
  • tweak: The Emag is now one item again.

VMSolidus and others added 19 commits February 19, 2025 22:41
# Description

Ports the Cybersun Stealthsuit by popular demand. I've made a few
changes to it for this codebase to better accomodate for some of our MRP
standards, including making sure that it correctly modifies the sound
emitter that all hardsuits share. Rather than deleting the sound
effects, it modifies them to be significantly quieter, with harsher
falloff such that it can only be heard to a maximum distance of 5 tiles.
Its stats and costs are rebalanced around being weaker for fighting, but
it by extension a lot cheaper than it is on LRP.

I spent more time trying to figure out how to fix the stealth movement
balance to something I was satisfied with, than I did porting the suit.

It also got a new name to match the naming scheme of the other Cybersun
suits. For EE's code, it's balanced a lot differently than it is on Goob
LRP. It's cheaper here than it is there, and more strongly favors the
"Stealth" side of balance than it does combat. If you move sufficiently
slowly, you can remain in stealth. It makes noise like a "Light"
hardsuit, but is significantly muffled. It offers less protection than
the Security tacsuits. It's really not for direct combat, and is
*strongly* meant to play to the metal gear 4 fantasy.

<details><summary><h1>Media</h1></summary>
<p>


![image](https://github.com/user-attachments/assets/db30c1a5-af8e-4748-bc52-4dcc61833eaf)

</p>
</details>

# Changelog

:cl:
- add: Ported the Cybersun Stealthsuit from Goobstation, with some
updates for the EE Codebase.

---------

Co-authored-by: starch <[email protected]>
Cherrypicks space-wizards/space-station-14#29151
by Durk's request

---------

Co-authored-by: DrSmugleaf <[email protected]>
# Description

Makes the Muted trait give sign language to reflect the description.
Blacklists muted characters from taking sign language to accomodate
this. Additionally blacklists muted characters from taking Singer or
Lyrebird, as you cannot use the singing ability while muted.

---

# Changelog

:cl:
- tweak: Made Muted give sign language
- tweak: Blacklisted muted characters from taking sign language
- fix: Blacklisted muted characters from taking Singer or Lyrebird

---------

Signed-off-by: GNUtopia <[email protected]>
# Description

Fixes a small issue with pebble that was causing test fails. Also
removes the captain's laser from being mapped. He gets it from loadouts
now, and chooses between it and other options that take the place of the
traitor steal objective target. It should not be mapped like this
anymore because that would create a duplicate of an item which is only
supposed to be one of on the map.
…) (#1829)

high lighting quality is no longer fucked

:cl:
- fix: Ported fix for high lighting quality

Co-authored-by: metalgearsloth <[email protected]>
# Description

Makes the singulo stop quantum tunneling through its containment. If
this doesn't work and I'm still on vacation beating up nerds in the
woods, you need to revert this pr right here:
Simple-Station/Einstein-Engines#1619

# Changelog

:cl:
- fix: Singularity shouldn't escape its containment anymore. If it's
still escaping containment, do me a favor and revert PR 1619 (Newtonian
Singularity)

---------

Co-authored-by: Partmedia <[email protected]>
Pretty please. I don't see a reason why they shouldn't.

# Description
Just gave humans access to more ear options. 

---

<details><summary><h1>Media</h1></summary>


![image](https://github.com/user-attachments/assets/efe508de-3845-4168-b2ee-31ebb762a2cc)
</details>

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- tweak: Humans now have a larger variety of ears
# Description

Adds a new "Primary Weapon" category for Blueshield Officer, which the
Chester rifle is the origin point for. Per discord discussions, this
list includes an option to replace the Chester with an energy
shield(It's way more fitting for a bodyguard to have an energy shield
oddly enough), or to pay extra points to swap it for the new BRDI-R25
rifle.

<details><summary><h1>Media</h1></summary>
<p>


![image](https://github.com/user-attachments/assets/32443925-e53d-4f00-a94b-93650211a3b4)

</p>
</details>

# Changelog

:cl:
- add: Added "Blueshield primary weapon" loadout group. His primary
selection currently consists of the classic Chester rifle, an energy
shield, and an R25.
# Description

I said I was going to do this previously, so here I am. this adds a few
more "Common Handgun" recipes to the Arsenal research, to be
manufactured at a security techfab. Currently the list just includes
Mk58(available at Tier 1), and N1984, Viper, and Cobra at Tier 2. Most
common firearms are manufactured primarily using Aluminium as their main
body material, which is (currently) only obtainable by Salvage.

Also adds an option to order the new BRDI-R25 from Cargo. They are
somewhat expensive, although not quite to the extreme extent something
imported from Sol' would be. Instead they're a highly sought after gun
from a manufacturer local to the same region NT operates in and is
friendly towards. So more the "Normal" kind of scarcity.

# Changelog

:cl:
- add: Added handgun manufacturing to Arsenal research. Most firearms
made this way require Aluminium mined from planets to manufacture.
- add: The BRDI-R25 rifle can now be purchased via cargo.
Copy link
Contributor

github-actions bot commented Feb 21, 2025

RSI Diff Bot; head commit 41e5336 merging into 3855bf7
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Objects/Tools/doorjack.rsi

State Old New Status
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi

State Old New Status
icon-flash Added
icon Added
off-equipped-HELMET Added
on-equipped-HELMET Added

Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after 41e5336

@sleepyyapril sleepyyapril merged commit 96f32c9 into TheDenSS14:master Feb 21, 2025
10 of 11 checks passed
@sleepyyapril sleepyyapril deleted the armory branch February 21, 2025 15:15
TheDen-Bot added a commit that referenced this pull request Feb 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants