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

Fuck You #44

Closed
wants to merge 113 commits into from
Closed

Fuck You #44

wants to merge 113 commits into from

Conversation

Aidenkrz
Copy link
Contributor

FUCK YOUUU

metalgearsloth and others added 30 commits January 4, 2025 13:34
* Station AI overlay

* implement

* Bunch of ports

* Fix a heap of bugs and basic scouting

* helldivers

* Shuffle interactions a bit

* navmap stuff

* Revert "navmap stuff"

This reverts commit d1f89dd4be83233e22cf5dd062b2581f3c6da062.

* AI wires implemented

* Fix examines

* Optimise the overlay significantly

* Back to old static

* BUI radial working

* lots of work

* Saving work

* thanks fork

* alright

* pc

* AI upload console

* AI upload

* stuff

* Fix copy-paste shitcode

* AI actions

* navmap work

* Fixes

* first impressions

* a

* reh

* Revert "navmap work"

This reverts commit 6f63fea6e9245e189f368f97be3e32e9b210580e.

* OD

* radar

* weh

* Fix examines

* scoop mine eyes

* fixes

* reh

* Optimise

* Final round of optimisations

* Fixes

* fixes
* Verb tweaks

Remove the LOS check because this is already done above in CanExamine.

* Fix outlines

* import
* ItemToggle + slots stuff

- Add component for itemslot locks to match LockComponent (surprised this didn't exist).
- Add thing for pointlight to match itemtoggle. In future should be used for PDAs and stuff but need to fix some other stuff first.

* Also this

* grill
* Station AI overlay

* implement

* Bunch of ports

* Fix a heap of bugs and basic scouting

* helldivers

* Shuffle interactions a bit

* navmap stuff

* Revert "navmap stuff"

This reverts commit d1f89dd4be83233e22cf5dd062b2581f3c6da062.

* AI wires implemented

* Fix examines

* Optimise the overlay significantly

* Back to old static

* BUI radial working

* lots of work

* Saving work

* thanks fork

* alright

* pc

* AI upload console

* AI upload

* stuff

* Fix copy-paste shitcode

* AI actions

* navmap work

* Fixes

* first impressions

* a

* reh

* Revert "navmap work"

This reverts commit 6f63fea6e9245e189f368f97be3e32e9b210580e.

* OD

* radar

* weh

* Fix examines

* scoop mine eyes

* fixes

* reh

* Optimise

* Final round of optimisations

* Fixes

* fixes
* Move SleepingSystem to Shared & cleanup

* Remove empty OnShutdown handler
Applies EntProtoId changes upon insertion / removal from container. Can also be useful for borgs / mechs / vehicles in future but atm I just used it for AI.
* Re-add improved random sentience event

* Make randomly sentient PDA more likely

* Make vending machine sentience less likely

* Make requested changes

* Make randomly sentient captain's gear more likely

* Sentient captain sabre has pirate accent

* Tweak new random sentient object a bit more

* Sentient PDA improvements

* Apply recommended fixes

* Add requested changes

* Fix merge conflict
# Description

**(Use a MERGE COMMIT, not squash if possible to ~~avoid~~ reduce merge
conflicts for our downstream)**

Cherry-picks some PRs from The Den:

- TheDenSS14/TheDen#8
- TheDenSS14/TheDen#31
- TheDenSS14/TheDen#108
- TheDenSS14/TheDen#116
- TheDenSS14/TheDen#117
- TheDenSS14/TheDen#123
- TheDenSS14/TheDen#124

# 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: The Den Contributors
- fix: Put actual prescription lenses in the prescription medhuds and
sechuds (by KyuPolaris)
- add: Added the CMO turtleneck and head mirror to the CMO loadouts. (by
sleepyyapril, KyuPolaris)
- add: Added an armored trenchcoat for the Captain. Enjoy your swag! (by
Rosycup)
- fix: Fixed uneven pants leg on summer security uniforms. (by Rosycup)
- add: Added the Captain's Combat Gas Mask, for those more fond of close
encounters. (by Rosycup)
- tweak: Added the Captain's Trenchcoat to the other captain locker
variants. (by Rosycup)
- fix: Fixed they/them pronouns being displayed for it/its characters in
the character preview. (by Azzy)

---------

Co-authored-by: flyingkarii <[email protected]>
Co-authored-by: sleepyyapril <[email protected]>
<!--
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]?
-->

Port from
[WWDP](WWhiteDreamProject/wwdpublic#212)

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>
How it was before:

![image](https://github.com/user-attachments/assets/1a991dcc-a108-4e73-8bbe-8fbbc1a766a6)
How is it now:

![image](https://github.com/user-attachments/assets/80aaff73-de50-447a-a442-10a35ddf56be)
</p>
</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: Spatison
- fix: Humanoid color in the spawn panel is now correct.
- fix: IPCs can no longer spawn invisible.
<!--
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]?
-->

Makes non-verbal languages no longer emit speech sounds. Ported from
[Goob-Station-MRP#29](Goob-Station#29)
at @angelofallars's request.

---


<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

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


![PR
Example](https://github.com/user-attachments/assets/8be6b705-eff7-4e2e-ab53-5648dccfc7eb)


</p>
</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: Languages that don't require speech (I.E. Sign Language) will
no longer play speech sounds.

---------

Signed-off-by: RadsammyT <[email protected]>
Co-authored-by: Skubman <[email protected]>
Co-authored-by: flyingkarii <[email protected]>
Co-authored-by: sleepyyapril <[email protected]>
Co-authored-by: SimpleStation Changelogs <[email protected]>
<!--
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
This adds the Time Transfer Panel that Goobstation uses. This panel
enables Admins to do Time Transfers without commands and makes their
lives easier. This immediately has access to all playtime trackers and
allows an Admin to Add Time and/or Set Time (overwriting the previous
time) for any job role. It also enables extra strings since I ported
from Wizden upstream as well, which can be seen in the commit history.

A thing of note when testing this and using it in a server: the times
**DO NOT UPDATE** for Client until your **RELOG**. This is how it works
on Goobstation as well. The time adding process is faster and will be
easier tool.

This is tied to the AdminFlags.Admin so it can be customized on a
per-server basis if a custom flag is added.

---

# TODO
- [x] Port Upstream Role Define.
- [x] Port string extras for playtime commands.
- [x] Port Time Transfer Panel
- [x] Remove Overall (it just doesn't work on Goob either).

---

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


![image](https://github.com/user-attachments/assets/e9a50f41-9440-474b-b06f-a4387f12ae0b)

![image](https://github.com/user-attachments/assets/31dc2f1e-f1be-4489-bd6f-9390dfee4e72)

![image](https://github.com/user-attachments/assets/f2507f9a-f4a6-4d64-b554-e648e87ff16f)

![image](https://github.com/user-attachments/assets/724fa5c7-9abf-43e0-9eb0-af4484d00f03)

![image](https://github.com/user-attachments/assets/127e6a39-d0e8-426e-95d7-13f46ca40e17)

![image](https://github.com/user-attachments/assets/3856780a-75ca-4804-8832-1b8eed0be8d2)

![image](https://github.com/user-attachments/assets/eb9b9e88-c6fe-4755-a244-6af5b06acb54)

![image](https://github.com/user-attachments/assets/d0960206-2501-4afa-b030-e00ff0a44c01)

![image](https://github.com/user-attachments/assets/891df87e-d8c4-4c6d-a599-9706d592770e)

</p>
</details>

---

# Changelog
:cl:
ADMIN:
- add: Add Time Transfer Panel

---------

Co-authored-by: BombasterDS <[email protected]>
Co-authored-by: Leon Friedrich <[email protected]>
Co-authored-by: flyingkarii <[email protected]>
I'm not fully confident in this fix, I can't test it right now.
closes #1409 1409

---------

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

Fixes notifications so that they always trigger when the chat is not
open, fixes a possible exploit where a user can send a message that is
longer than the max message length, and improves the UX of NanoChat in a
few areas.

Original message from
Goob-Station/Goob-Station#1313:
> Fixed NanoChat message notifications not showing up in situations
where you'd definitely expect them to occur.
> 
> Now, for a chat to not send a notification upon a new message, three
conditions need to be fulfilled:
> - You don't have the chat muted
> - Your PDA UI is open
> - You have NanoChat as your open program
> - Your currently-selected chat is the aforementioned chat

More changes:
- Validate NanoChat message length & chat name/job title length on the
server
Goob-Station/Goob-Station@c063001.
  -If they are too long, they will be truncated to the maximum length. 
- Improve the UI for editing a chat:
- Added a proper icon (used to be the letter E) for the Edit Chat
button.

![image](https://github.com/user-attachments/assets/ce868829-a9f5-494b-9d15-2cbc4a7e2a86)
- The Edit Chat popup now has correct text: the title is now "Edit a
contact", not "Add a new chat" and the Create button has been renamed to
the Confirm button.

![image](https://github.com/user-attachments/assets/aabd84b3-0f3c-410a-a74e-06420eb336dc)
  - Editing a chat no longer deselects the current chat.
- This is done by adding a new NanoChatUiMessageType entry, `EditChat`
and a new server-side handler function just for chat edits. The previous
edit chat method simply *deleted* the chat from the client and created a
new one.
- Form validation is now more robust: you can now only submit the edit
if you've made changes to the name or job title.
- Fixed NanoChat not appearing in PDAs with more than 5 pre-installed
programs by increasing the PDA disk space (max program count) from 5 to
8, the current disk space in Wizden.

![image](https://github.com/user-attachments/assets/e214fa21-5365-4f8a-8919-c6019d3b94bb)
- The job title now appears on the notification title.

![image](https://github.com/user-attachments/assets/486f5b2a-c555-4d1a-97ef-4dab3d8e1102)
  - The title will be truncated if it's too long.

![image](https://github.com/user-attachments/assets/ef99805c-b004-456a-9b59-e48f4abbe4ab)
- Improved form validation on the New Chat popup by only allowing users
to submit if the Number field is 4 numbers long. Previously, inputs like
"0" "12" "289" were valid which is ultimately incorrect as phone numbers
function more like strings that just happen to be digit-only and less
like actual numbers.

![image](https://github.com/user-attachments/assets/e3a767ff-71cb-4c61-b3e9-be13af66fd60)
- The left chat list will now truncate names and job titles if they're
too long.

![image](https://github.com/user-attachments/assets/76a8fbfa-e5e5-495c-ad13-fc9444e6ce9a)

## Changelog
:cl: Skubman
- add: NanoChat message notifications will now show you the job title of
the sender alongside their name.
- add: The NanoChat edit button now has a proper icon.
- tweak: The disk space (max amount of installable programs) on PDAs has
been increased from 5 to 8. This also fixes a bug where NanoChat was not
being installed on PDAs with more than 5 pre-installed cartridges.
- tweak: The character limit for names and job titles in NanoChat has
been increased to their actual limit on ID cards (30 characters).
- tweak: NanoChat chat list names/titles and notification titles that
are too long will be shortened, indicated with "..." at the end.
- tweak: The NanoChat edit popup now displays the correct text, instead
of appearing identical to the new chat popup.
- fix: NanoChat will now send a new message notification no matter what
if you don't have the chat open.
- fix: Editing a chat in NanoChat no longer deselects that chat.
- fix: Fixed a issue where users could potentially send NanoChat
messages longer than the maximum allowed message length.
- fix: Fixed being able to create a new chat when you haven't typed in 4
digits in the number field.
sleepyyapril and others added 13 commits January 11, 2025 17:32
<!--
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]?
-->

Adds a command that adds the playtime requirements of a job.

---

# 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:
ADMIN:
- add: Added a command to easily allow for adding a jobs playtime
requirements. (playtime_unlock)
yeag

---------

Co-authored-by: Pieter-Jan Briers <[email protected]>
Co-authored-by: Leon Friedrich <[email protected]>
* porting vulcan changed from grimbly

* rename .30 rifle projectiles to .30 and buff damage

* actually buff .30 instead of just renaming the projectile

* wrong fucking file ffs

* buff rifle rounds that should be buffed and add comments on the others

* yaml linter unfail
* Update detective.yml

half sec playtime need

* Update head_of_security.yml

read it yourself nerd

* Update warden.yml

* Update boxer.yml

* Update psychologist.yml

* Update quartermaster.yml

* Update salvage_specialist.yml

* Update chaplain.yml

Noting down the racism mechanics for later

* Update chaplain.yml

Gets rid of space racism

Robots can now believe in god

* Update clown.yml

* Update lawyer.yml

* Update librarian.yml

* Update chaplain.yml

* Update musician.yml

* Update service_worker.yml

* Update captain.yml

barely anyone plays command already
the last fucking thing we need is a whitelist and 30hr total + 30hr command + 5hr of each department playtime for a single person to be captain

(even without role timers there was only a cap 30% of the time)
(this makes it worse still)

* Update head_of_personnel.yml

* Update atmospheric_technician.yml

* Update chief_engineer.yml

* Update senior_engineer.yml

* Update station_engineer.yml

* Update technical_assistant.yml

also fixes the problem of TAs not getting meson goggles - its a intern role, they WILL forget and they WILL get blind from welding

* Update technical_assistant.yml

* Update chemist.yml

* Update chief_medical_officer.yml

* Update medical_doctor.yml

* Update medical_intern.yml

* Update paramedic.yml

* Update senior_physician.yml

* Update borg.yml

* Update research_assistant.yml

* Update research_director.yml

* Update roboticist.yml

* Update scientist.yml

* Update senior_researcher.yml

* Update chief_justice.yml

* Update clerk.yml

* Update prosecutor.yml

* Update medical_borg.yml

* Update brigmedic.yml

* Update ninja.yml

* Update nukeops.yml

* Update revolutionary.yml

* Update traitor.yml

* Update zombie.yml
* Adding Rules and SOP to MRP.

* Fixed typos, added 'Prison Guard' and 'Corpsman', and fixed parsing errors in BSO, NTR, and Alert Levels.

* Fix dumb shit that happened.

* Removed the unnecessary code. (I didn't port all of the LRP change).
…tion#28)

* cherrypick the rest of my gun buffs and fix conflicts while adding comments on buffed guns

* buff shotguns and add uranium shell AP

* buff lasers
Copy link
Contributor

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

Copy link
Contributor

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

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.