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

Next EE Stable Playtest #79

Merged
merged 20 commits into from
Oct 13, 2024
Merged

Next EE Stable Playtest #79

merged 20 commits into from
Oct 13, 2024

Conversation

VMSolidus
Copy link
Contributor

Description

This is the final update to EE Master before the Wizmerge is merged to EE Master, so this PR acts as the final merge before I FULL SEND IT with the Wizmerge on EE. This will be for tonight to playtest an update to EE Stable.

Fansana and others added 20 commits October 13, 2024 12:38
# Description

Fixes the arrivals shuttle choosing to correct docking port.
---

- [ ] Fix all maps and place the correct airlock (yeah not gonna do that
in this PR)
- [x] Fixed arrivals shuttle logic

---

# Changelog

:cl:
- fix: Fixes the arrivals shuttle choosing to correct docking port.
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

This is an emercency fix regarding Custom Name, apprently this is
fucked... wow...
Regarding DB issues please @DEATHB4DEFEAT review or check if you can
assist or anyone.

Thank you.

---

# 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:
- fix: Custom Specie Name!

---------

Signed-off-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

meow. 
Project compiles and starts. Is the bug gone? I hope so.

---

# Changelog

:cl:
- fix: Latejoin antag selection should respect player's antag
preferences.

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

This add the missing tags for webs for Oneirophage to hide in webs
(works tested on floof)

Overall Oneirophage need more changes, languages, psionic, ect but so
far this is needed.

---

# 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:
- fix: Oneirophage is once more psionic invisible in webs.

Signed-off-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com>
# Description
This reverts most code changes done by
Simple-Station/Einstein-Engines#939 and
re-implements them in a better way:
- Players can now toggle under-furniture crawling with a keybind
(shift-R by default)
- Crawling that way is 50% slower for obvious balancing reasons
- The respective cvar for it is now true by default and prevents players
from beginning the "crawl under furniture" thing

Also cleaned up a few methods I was seriously pissed off by. There is
still a lot to clean up and fix, but I will leave it for a dedicated PR
in the future.

# Why (balancing)
Let me lie on the bed instead of under it!!!!!!!

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


https://github.com/user-attachments/assets/5f04c82a-b88b-4005-8052-a1a6f011bcc9

</p>
</details>

# Changelog
:cl:
- add: You can now toggle crawling under furniture! The default keybind
is Shift-R, you can change it in settings.
They also didn't have `:`s like everything else.

# Changelog

:cl:
- tweak: Made the show clothing/loadouts button labels more clear

Signed-off-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
This is an automated Pull Request. This PR updates the GitHub
contributors in the credits section.

Co-authored-by: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
# Description

This is a fucking stupid method of irreversible round removal. Gib
someone and then eat their brain instantly. This PR makes brains not
food, so that they can't be eaten instantly.

# Changelog

:cl:
- tweak: Brains now can no longer be eaten.
# Description

This PR adds several new "High Cost Physical Traits", that each follows
a theme of Transhumanism. Bionic augmentations that provide the user
some benefit, typically at a very high cost.

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


![image](https://github.com/user-attachments/assets/f2d0b007-5632-45a6-87a5-c4a677742fd6)


![image](https://github.com/user-attachments/assets/ebd336f5-df98-4ef4-a4f1-edbdfdfda27d)


![image](https://github.com/user-attachments/assets/e9ff5d13-099e-4004-b2cd-162601bddfc3)


![image](https://github.com/user-attachments/assets/cb3dfc03-72f9-4d9a-9897-22d14a579787)

</p>
</details>

# Changelog

:cl:
- add: Added 8 new Physical Traits. These are, Cyber-Eyes Basic
System(Plus 4 different modular options), Bionic Arm, Dermal Armor, and
Platelet Factories.

---------

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
# Description

This PR adds several new "Contractor" uniforms to service roles, as well
as several job specific loadout categories. These make use of sprites
taken from Aurora, as well as corporations from Aurora. Currently no
jumpskirts are available for these.

# TODO

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


![image](https://github.com/user-attachments/assets/f6ce6471-6da5-4881-b730-8fe08c2d630b)


![image](https://github.com/user-attachments/assets/89e30b8c-5a86-489e-8c22-13459aa2b08e)

</p>
</details>

# Changelog

:cl:
- add: NT has started hiring contractors from other corporations to fill
out station staff. New loadout items for corporate contractors are now
available for Bartender, Botanist, Cataloguer, Chef, and Janitor.
Currently there are no jumpskirt versions of these uniforms. We are
looking for people willing to make skirt variations of each of these.
# Description
Showing some love to our hard-working couriers.

This cherry-picks the following PRs from delta-v:
- DeltaV-Station/Delta-v#1472 - Adds a
MailMetrics PDA cartridge for couriers and the LO
- DeltaV-Station/Delta-v#1652 - Ports mail
tweaks from frontier to delta-v, adding large packages, RPDs (mail
cannons), and more mail
- DeltaV-Station/Delta-v#1788 - Adding a couple
more packages
- DeltaV-Station/Delta-v#1925 - Fixing the
non-functional "last known location" part of mail descriptions

Some mail items, such as the opporozidone syringe and rainbow
joints/blunts, had to be disabled because we don't have them (yet?)

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


![image](https://github.com/user-attachments/assets/2299ffc3-17ce-4743-886c-7705e8789e96)


![image](https://github.com/user-attachments/assets/a2ee1a07-d765-41e7-8f70-f94a50412398)


![image](https://github.com/user-attachments/assets/03b16b8e-0eff-4332-99ad-d4a201ee8f2b)


![image](https://github.com/user-attachments/assets/44d2e5c2-db79-4d8d-8877-693648edd35d)


![image](https://github.com/user-attachments/assets/f3d7bdbb-fc14-4f2f-bf30-aa54fdf49099)


![image](https://github.com/user-attachments/assets/b1e4c53f-c9d8-496b-a72e-f4f4b702e368)

</p>
</details>

---

# Changelog
:cl:
- add: The Courier and Logistics Officer now have a new program in their
PDA for tracking mail delivery performance, including earnings and
percent of packages opened, damaged, or expired.
- add: The list of possible mail packages has been greately expanded,
and now includes large parcels.
- add: The CourierDrobe now offers a rapid mail delivery device, along
with capsules for it.

---------

Signed-off-by: Adeinitas <147965189+adeinitas@users.noreply.github.com>
Co-authored-by: portfiend <109661617+portfiend@users.noreply.github.com>
Co-authored-by: byte <50130120+huckleton@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Adeinitas <147965189+adeinitas@users.noreply.github.com>
Co-authored-by: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com>
Co-authored-by: Dvir <dvirf01@gmail.com>
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
Co-authored-by: Whatstone <whatstone3@gmail.com>
Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Co-authored-by: Milon <plmilonpl@gmail.com>
Copy link
Contributor

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

Resources/Textures/DeltaV/Objects/Devices/cartridge.rsi

State Old New Status
cart-mail Added

Resources/Textures/Objects/Misc/mail_capsule.rsi

State Old New Status
icon-cash Added
icon-empty Added
icon-food Added
icon-mail Added
spent Added

Resources/Textures/Objects/Specific/Mail/mail_large.rsi

State Old New Status
broken Added
fragile Added
icon Added
inhand-left Added
inhand-right Added
locked Added
priority Added
priority_inactive Added
trash Added

Resources/Textures/Objects/Weapons/Guns/Launchers/mail.rsi

State Old New Status
bolt-open Added
equipped-BACKPACK Added
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

@VMSolidus VMSolidus merged commit 12b331e into master Oct 13, 2024
13 of 14 checks passed
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.

7 participants