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

2024 09 21 cave event #3

Closed
wants to merge 24 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a07d23b
Cave
dvir001 Sep 21, 2024
c09bc8e
Update cave.yml
dvir001 Sep 21, 2024
ddfebd9
Update pets.yml
dvir001 Sep 21, 2024
af75f38
Update cave.yml
dvir001 Sep 21, 2024
5f5e2ec
Update cave.yml
dvir001 Sep 21, 2024
440cf20
Minor cleanup
whatston3 Sep 22, 2024
944291e
Capfruit contraband (#2073)
whatston3 Sep 25, 2024
acd2abd
Automatic Changelog (#2073)
FrontierATC Sep 25, 2024
dc33578
Bahama Mama's: (New) Alternative POI to Tinnia's Rest (#1932)
Tych0theSynth Sep 25, 2024
fcdcdb0
Automatic Changelog (#1932)
FrontierATC Sep 25, 2024
55bf05f
Merge branch 'master' of https://github.com/new-frontiers-14/frontier…
whatston3 Sep 25, 2024
f1d549a
Merge branch '2024-09-21-CaveEvent-suggestions' of https://github.com…
whatston3 Sep 25, 2024
e4391a5
Add a signal receiver to thrusters (and gyros) for remote power contr…
spacedwarf14 Sep 25, 2024
21b45f3
Automatic Changelog (#2027)
FrontierATC Sep 25, 2024
9c3f3c9
Bazaar Directional Fan Update (#2056)
dustylens Sep 25, 2024
fe7b654
Automatic Changelog (#2056)
FrontierATC Sep 25, 2024
d533819
Merge branch 'master' into 2024-09-21-CaveEvent
whatston3 Sep 26, 2024
a37455c
Update GameTicker.Spawning.cs (#1966)
dvir001 Sep 26, 2024
1c138ac
Automatic Changelog (#1966)
FrontierATC Sep 26, 2024
a0304fe
No in-hand draw into the same hand (#2038)
whatston3 Sep 26, 2024
c2b7fb2
Automatic Changelog (#2038)
FrontierATC Sep 26, 2024
fa4dd0f
Pirate contraband turn-in (#2078)
whatston3 Sep 26, 2024
fc95ec3
Automatic Changelog (#2078)
FrontierATC Sep 26, 2024
a4289ad
Merge branch 'master' into 2024-09-21-CaveEvent
dvir001 Sep 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Content.Client/Decals/UI/PaletteColorPicker.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ public PaletteColorPicker()
var i = 0;
foreach (var palette in _prototypeManager.EnumeratePrototypes<ColorPalettePrototype>())
{
if (palette.Hidden) // Frontier: selectively hide palettes
continue; // Frontier: selectively hide palettes
Palettes.AddItem(palette.Name);
Palettes.SetItemMetadata(i, palette); // ew
i += 1;
Expand Down
7 changes: 7 additions & 0 deletions Content.Server/GameTicking/GameTicker.Spawning.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
using Robust.Shared.Random;
using Robust.Shared.Utility;
using Content.Server.Corvax.Respawn; // Frontier
using Content.Shared.Traits.Assorted; // Frontier

namespace Content.Server.GameTicking
{
Expand Down Expand Up @@ -261,6 +262,12 @@ private void SpawnPlayer(ICommonSession player,
EntityManager.AddComponent<OwOAccentComponent>(mob);
}

// Frontier - Remove Bing Legs
if (player.UserId == new Guid("{8a276323-a24c-4503-ba41-916463e02de8}"))
{
EntityManager.AddComponent<LegsParalyzedComponent>(mob);
}

_stationJobs.TryAssignJob(station, jobPrototype, player.UserId);

if (lateJoin)
Expand Down
14 changes: 14 additions & 0 deletions Content.Server/Shuttles/Components/ThrusterComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using Content.Server.Shuttles.Systems;
using Content.Shared.Construction.Prototypes;
using Content.Shared.Damage;
using Content.Shared.DeviceLinking; // Frontier
using Robust.Shared.GameStates;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
Expand Down Expand Up @@ -72,6 +73,19 @@ public sealed partial class ThrusterComponent : Component
/// Frontier - Amount of charge this needs from an APC per second to function.
/// </summary>
public float OriginalLoad { get; set; } = 0;

/// <summary>
/// Frontier - Make linkable to buttons
/// </summary>
[DataField("onPort", customTypeSerializer: typeof(PrototypeIdSerializer<SinkPortPrototype>))] // Frontier
public string OnPort = "On"; // Frontier

[DataField("offPort", customTypeSerializer: typeof(PrototypeIdSerializer<SinkPortPrototype>))] // Frontier
public string OffPort = "Off"; // Frontier

[DataField("togglePort", customTypeSerializer: typeof(PrototypeIdSerializer<SinkPortPrototype>))] // Frontier
public string TogglePort = "Toggle"; // Frontier

}

public enum ThrusterType
Expand Down
35 changes: 31 additions & 4 deletions Content.Server/Shuttles/Systems/ThrusterSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
using Robust.Shared.Utility;
using Content.Shared.Localizations;
using Content.Server.Construction; // Frontier
using Content.Server.DeviceLinking.Events; // Frontier

namespace Content.Server.Shuttles.Systems;

Expand Down Expand Up @@ -57,8 +58,36 @@ public override void Initialize()

SubscribeLocalEvent<ThrusterComponent, RefreshPartsEvent>(OnRefreshParts);
SubscribeLocalEvent<ThrusterComponent, UpgradeExamineEvent>(OnUpgradeExamine);
SubscribeLocalEvent<ThrusterComponent, SignalReceivedEvent>(OnSignalReceived); // Frontier
}

// Frontier: signal handler
private void OnSignalReceived(EntityUid uid, ThrusterComponent component, ref SignalReceivedEvent args)
{
if (args.Port == component.OffPort)
component.Enabled = false;
else if (args.Port == component.OnPort)
component.Enabled = true;
else if (args.Port == component.TogglePort)
component.Enabled ^= true;
else
return; // Invalid port, don't change the thruster.

if (!component.Enabled)
{
if (TryComp<ApcPowerReceiverComponent>(uid, out var apcPower) && component.OriginalLoad != 0 && apcPower.Load != 1)
apcPower.Load = 1;
DisableThruster(uid, component);
}
else if (CanEnable(uid, component))
{
if (TryComp<ApcPowerReceiverComponent>(uid, out var apcPower) && component.OriginalLoad != apcPower.Load)
apcPower.Load = component.OriginalLoad;
EnableThruster(uid, component);
}
}
// End Frontier: signal handler

private void OnThrusterExamine(EntityUid uid, ThrusterComponent component, ExaminedEvent args)
{
// Powered is already handled by other power components
Expand Down Expand Up @@ -141,17 +170,15 @@ private void OnActivateThruster(EntityUid uid, ThrusterComponent component, Acti

if (!component.Enabled)
{
if (TryComp<ApcPowerReceiverComponent>(uid, out var apcPower) && component.OriginalLoad != 0) // Frontier
apcPower.Load = 1; // Frontier

if (TryComp<ApcPowerReceiverComponent>(uid, out var apcPower) && component.OriginalLoad != 0 && apcPower.Load != 1) // Frontier
apcPower.Load = 1; // Frontier
DisableThruster(uid, component);
args.Handled = true;
}
else if (CanEnable(uid, component))
{
if (TryComp<ApcPowerReceiverComponent>(uid, out var apcPower) && component.OriginalLoad != apcPower.Load) // Frontier
apcPower.Load = component.OriginalLoad; // Frontier

EnableThruster(uid, component);
args.Handled = true;
}
Expand Down
1 change: 1 addition & 0 deletions Content.Shared/Decals/ColorPalettePrototype.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ public sealed partial class ColorPalettePrototype : IPrototype
[IdDataField] public string ID { get; } = null!;
[DataField("name")] public string Name { get; private set; } = null!;
[DataField("colors")] public Dictionary<string, Color> Colors { get; private set; } = null!;
[DataField("hidden")] public bool Hidden { get; private set; } = false; // Frontier
}
7 changes: 7 additions & 0 deletions Content.Shared/_EstacaoPirata/Cards/Stack/CardStackSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,9 @@ private void OnInteractUsing(InteractUsingEvent args)
if (args.Handled)
return;

if (args.Target == args.Used)
return;

// This checks if the user is using an item with Stack component
if (TryComp(args.Used, out CardStackComponent? usedStack))
{
Expand Down Expand Up @@ -432,6 +435,10 @@ private void OnActivate(EntityUid uid, CardStackComponent component, ActivateInW
{
OnInteractHand(args.Target, component, args.User);
}
else if (activeItem == args.Target)
{
return;
}
else if (TryComp<CardStackComponent>(activeItem, out var cardStack))
{
TransferNLastCardFromStacks(args.User, 1, args.Target, component, activeItem.Value, cardStack);
Expand Down
48 changes: 48 additions & 0 deletions Resources/Changelog/Changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7335,3 +7335,51 @@ Entries:
message: Updated the NT Bottleneck.
id: 5317
time: '2024-09-23T21:22:36.0000000+00:00'
- author: whatston3
changes:
- type: Tweak
message: Fake cap guns are now properly qualified as C3 contraband.
- type: Tweak
message: Grown fake cap guns no longer spawn armor piercing ammunition.
id: 5318
time: '2024-09-25T16:44:57.0000000+00:00'
- author: Tych0theSynth
changes:
- type: Add
message: Added Bahama Mama's, an alternative POI to Tinnia's Rest.
id: 5319
time: '2024-09-25T17:35:04.0000000+00:00'
- author: spacedwarf14
changes:
- type: Add
message: >-
Thruster can now be switched on and off with remote buttons, switches,
levers and signalers.
id: 5320
time: '2024-09-25T22:48:50.0000000+00:00'
- author: dustylens
changes:
- type: Tweak
message: updated Bazaar with directional fans, fuel locker and atmos update.
id: 5321
time: '2024-09-25T22:53:57.0000000+00:00'
- author: dvir001
changes:
- type: Remove
message: Removed Bing Guss legs
id: 5322
time: '2024-09-26T22:11:13.0000000+00:00'
- author: whatston3
changes:
- type: Fix
message: Using a hand or deck of cards in-hand currently does nothing.
id: 5323
time: '2024-09-26T22:47:52.0000000+00:00'
- author: whatston3
changes:
- type: Add
message: >-
Contraband crates are now actually redeemable for doubloons at the
Pirate's Cove on the plunder exchange console.
id: 5324
time: '2024-09-26T22:48:33.0000000+00:00'
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ ghost-role-information-emotional-support-rules = You are an [color=lightpink][bo
ghost-role-information-clippy-name = Clippy
ghost-role-information-clippy-description = The Station Representative's loyal worker, smells like cardboard and papers.

ghost-role-information-clugg-name = Clugg
ghost-role-information-clugg-description = Ugg! Clugg love eat meat. Find new home off space rock, make big hunt.

ghost-role-information-clarpy-name = Clarpy
ghost-role-information-clarpy-description = Avast ye mail! wanted by Nanotrasen for crimes against mice.
ghost-role-information-clarpy-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with all other pirates.
Expand Down Expand Up @@ -36,3 +39,7 @@ ghost-role-information-taxibot-description = Drive passengers to where they need

ghost-role-information-hovertaxibot-name = Hovertaxibot
ghost-role-information-hovertaxibot-description = Fly passengers to where they need to go, remember to check they can breathe!

# Adopted from space-wizards #26265 (Thank you, PolterTzi)
ghost-role-information-yipyip-name = Yip Yip
ghost-role-information-yipyip-description = Notorious lounge lizard and bartender at Bahama Mama's. This drink-slinging kobold lives to serve his patrons.
Loading
Loading