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

Ghost Bar!!!! (From Goobstation) #1675

Merged
merged 17 commits into from
Jan 28, 2025

Conversation

angelofallars
Copy link
Member

@angelofallars angelofallars commented Jan 27, 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:

Wizden cherry-picked PRs:

Media

Ghost Bar UI

image

Ghost Bar In-Game

image

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

Changelog

🆑 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.

Aidenkrz and others added 13 commits January 27, 2025 21:09
* 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]>
* Foam Force

* make it available somewhere

* add clumsyproof and nuke dev item

* reorganize

* oopsy files

* Strap!

* woopsie layering

* fix grammar to rerun tests for rogue unrelated test fail.

* cleanup

* I eepy layer forgetti spaghetti

* For real last necessary commit

* Oops I broke the law! feexed

* Decided to just change it to the same source as the poster source in our repo for consistency.
@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: UI Changes any XAML files Changes: Map Changes any yml file in the Maps directories Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an RSI labels Jan 27, 2025
@SimpleStation14 SimpleStation14 changed the title Ghost bar!!!! (from Goobstation) Ghost Bar!!!! (From Goobstation) Jan 27, 2025
Copy link
Contributor

github-actions bot commented Jan 27, 2025

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

Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi

State Old New Status
icon Added
primed Added

Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi

State Old New Status
bolt-open Added
equipped-BACKPACK Added
equipped-SUITSTORAGE Added
icon Added

Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi

State Old New Status
inhand-left Added
inhand-right Added
wielded-inhand-left Added
wielded-inhand-right Added

Edit: diff updated after 69df48a

[Dependency] private readonly TraitSystem _trait = default!;
// Einstein Engines end

private static readonly List<JobComponent> _jobComponents = new() // Einstein Engines - use JobComponent
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically this is my fault but you need to add the funny lil [ValidatePrototypeID" or whatever its called here

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I dunno if that works on List of strings/proto id tho, it seems to only work on a single string/proto ID

@sleepyyapril sleepyyapril merged commit 0b4ceb2 into Simple-Station:master Jan 28, 2025
13 of 14 checks passed
SimpleStation14 added a commit that referenced this pull request Jan 28, 2025
@angelofallars angelofallars mentioned this pull request Jan 31, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants