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

drafty drafty draft pr #1

Open
wants to merge 82 commits into
base: master
Choose a base branch
from
Open

drafty drafty draft pr #1

wants to merge 82 commits into from

Conversation

angelofallars
Copy link
Owner

Description

Description.


TODO

  • Task
  • Completed Task

Media

Example Media Embed


Changelog

🆑

  • add: Added fun :D
  • tweak: Tweaked fun
  • fix: Fixed fun!
  • remove: Removed fun :(

Copy link

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

angelofallars pushed a commit that referenced this pull request Nov 30, 2024
…raits

NyanoCombat 2, Part 3: Stamina Traits
zelezniciar1 and others added 4 commits December 1, 2024 18:56
…tion#1302)

<!--
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 localization for the Senior Engineer and Senior Physician roles
that were recently enabled.

---

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

n/a

---

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


![Snímka obrazovky 2024-12-01
164702](https://github.com/user-attachments/assets/ca69e08d-5adb-4e71-aeda-5969d595e429)
![Snímka obrazovky 2024-12-01
165626](https://github.com/user-attachments/assets/18289899-2314-4d21-9b09-9e3e3415a6e0)


</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: zelezniciar
- fix: Fixed Senior Engineer and Physician names not appearing correctly
# Description

Fixes cultist constructs only speaking Universal and not being able to
understand anyone else due to a missing `LanguageKnowledgeComponent`.

## Changelog

:cl: Skubman
- tweak: Cultist constructs and soul shards now speak Tau-Ceti Basic and
Eldritch.

Co-authored-by: sleepyyapril <[email protected]>
angelofallars and others added 15 commits December 7, 2024 00:32
issue: Embedded was synced server/client but the other fields including EmbeddedDamageable was not
So when it was time to update embedded passive damage and change damage of Embedded's EmbeddedDamageable comp
it crashed cause EmbeddedDamageable was not owned by Embedded in client
removal time increased from 3s to 5s
require both user and target to stand still

a successful removal will cancel existing remove embed operations
AKA
only one embed removal at a time
this is kinda suboptimal would rather prevent the inevitably doafters from
happening in the first place
…ltiplier protofield to meleeDamageMultiplier
ComponentStartup was causing valid map test fails and would
ruin maps because the components were modified at startup
# Description

The latest update killed our generic rules, and made them not work
anymore. This PR brings them back.


![image](https://github.com/user-attachments/assets/2c7c7a64-3f06-4635-afe4-e6e941a374b7)

# Changelog

:cl:
- fix: Server rules work again.
angelofallars and others added 10 commits December 7, 2024 15:21
increase lunchbox damage from 2 to 5.5
glass shards deal 2x throwing damage but removal time decreased to 2.5
forks now deal embed passive damage (this isnt a lot cause they fall off after 10 secs)
hatchet gets 1.5x throwing damage and throwing angle is removed
lighters now have a different attack sound when turned on (same as welding tool)
zippos now have the throwing stuff (they didnt before cause they didnt inherit from Lighter)
fire axe thrown damage is now 1.5x but stamina cost increased to 18
tiles no longer embed, that never made sense
normal tile damage 4 -> 5.5
steel tile damage 7 -> 9.5
steel tile stamina cost 5 -> 6

floortile prying speed increased to encourage le interesting and creative crowbar tiles then throw them gameplay
<!--
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]?
-->

[Ports this downstream
PR.](Fansana/floofstation1#315)

---

# 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: fenndragon
- tweak: Moved the uplink deception category into utility.

---------

Co-authored-by: fenndragon <[email protected]>
…bjectives (Simple-Station#1323)

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

Title

---

# 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:
- add: Reintroduced 3 traitors objectives: steal Ian's meat, Die
Glorious Death and Hijack Evacuation Shuttle

Signed-off-by: Remuchi <[email protected]>
Copy link

github-actions bot commented Jan 8, 2025

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

angelofallars pushed a commit that referenced this pull request Jan 27, 2025
* Ghost bar!!!!

* Update Content.Server/Goobstation/Ghostbar/Components/GhostBarSpawnComponent.cs

Co-authored-by: Rank #1 Jonestown partygoer <[email protected]>

* Update Content.Server/Goobstation/Ghostbar/GhostBarSystem.cs

Co-authored-by: Rank #1 Jonestown partygoer <[email protected]>

* Update Content.Server/Goobstation/Ghostbar/GhostBarSystem.cs

Co-authored-by: Rank #1 Jonestown partygoer <[email protected]>

* Rule Window

* Delete on ghost + Random job selection

* Fix map

---------

Co-authored-by: Rank #1 Jonestown partygoer <[email protected]>
angelofallars added a commit that referenced this pull request Jan 28, 2025
# Description

Adds the Ghost Bar from Goob LRP. Upon spawn, the character's loadouts
and traits will also be applied as if their job was their Ghost Bar job.

Adjusts the weights for kill objectives, re-enabling the kill objective
and reducing the weight of Teach a Lesson now that there's more things
to do after getting round removed.

Goobstation cherry-picked PRs:
- Goob-Station/Goob-Station#454
- Goob-Station/Goob-Station#464
- Goob-Station/Goob-Station#689 (partially
applied to Ghost bar files only)
- Goob-Station/Goob-Station#963
- Goob-Station/Goob-Station#974
- Goob-Station/Goob-Station#982 (partially
applied to Ghost bar files only)
- Goob-Station/Goob-Station#1288 (partially
applied to Ghost bar files only)

Wizden cherry-picked PRs:
- space-wizards/space-station-14#29103 (for the
foam force rifle that spawns in the Ghost bar)

## Media

**Ghost Bar UI**


![image](https://github.com/user-attachments/assets/e46603b9-1798-4376-8af5-3df518ede76c)

**Ghost Bar In-Game**


![image](https://github.com/user-attachments/assets/14dbdc0a-9d75-487b-994e-1b1eabe7bff3)

Notice how the Ghost Bar character has loadout items in the backpack and
the Skeleton Accent trait.

## 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: Skubman
- add: Ghost Bar! When you die, you can now go to the Ghost Bar to chill
and talk about the round with other ghosts. (by Aidenkrz)
- add: Foam Force rifle to cargo lottery! (by IProduceWidgets)
- add: Re-enabled the Kill objective for traitors. 
- tweak: Reduced the chances of traitors getting the "Teach a Lesson"
objective.

---------

Co-authored-by: Aiden <[email protected]>
Co-authored-by: Rank #1 Jonestown partygoer <[email protected]>
Co-authored-by: IProduceWidgets <[email protected]>
Co-authored-by: Aviu00 <[email protected]>
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.

10 participants