Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
62 changes: 40 additions & 22 deletions Content.Server/Forensics/Systems/ForensicScannerSystem.cs
Original file line number Diff line number Diff line change
@@ -1,35 +1,53 @@
using System.Linq;
using System.Text;
using Content.Server._NF.Bank;
using Content.Server._NF.SectorServices;
using Content.Server._NF.Smuggling;
using Content.Server._NF.Smuggling.Components;
using Content.Server.Cargo.Systems;
using Content.Server.Popups;
using Content.Server.Stack; // Frontier
using Content.Server._NF.Smuggling; // Frontier
using Content.Server._NF.Smuggling.Components; // Frontier
using Content.Server.Cargo.Systems; // Frontier
using Content.Server.Radio.EntitySystems; // Frontier
using Content.Shared.UserInterface;
using Content.Server.Radio.EntitySystems;
using Content.Server.Stack;
using Content.Shared._NF.Bank;
using Content.Shared._NF.Bank.BUI;
using Content.Shared._NF.Bank.Components;
using Content.Shared._NF.CCVar;
using Content.Shared.Containers.ItemSlots;
using Content.Shared.DoAfter;
using Content.Shared.FixedPoint;
using Content.Shared.Forensics;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.Interaction;
using Content.Shared.Paper;
using Content.Shared.Verbs;
using Content.Shared.Stacks; // Frontier
using Content.Shared.Radio; // Frontier
using Robust.Shared.Prototypes; // Frontier
using Content.Shared.Radio;
using Content.Shared.Stacks;
using Content.Shared.Tag;
using Robust.Shared.Audio.Systems;
using Content.Shared.UserInterface;
using Content.Shared.Verbs;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Configuration;
using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
using Content.Shared.Containers.ItemSlots; // Frontier
using Content.Server._NF.SectorServices; // Frontier
using Content.Shared.FixedPoint; // Frontier
using Robust.Shared.Configuration; // Frontier
using Content.Shared._NF.CCVar; // Frontier
using Content.Shared._NF.Bank; // Frontier
using Content.Shared._NF.Bank.Components; // Frontier
using Content.Server._NF.Bank; // Frontier
using Content.Shared._NF.Bank.BUI; // Frontier
// Frontier
// Frontier
// Frontier
// Frontier
// Frontier
// Frontier
// Frontier
// Frontier
// Frontier
// Frontier
// Frontier
// Frontier
// Frontier
// Frontier
// Frontier
// Frontier

// Frontier

// todo: remove this stinky LINQy

Expand Down Expand Up @@ -119,7 +137,7 @@ private void GiveReward(EntityUid uidOrigin, EntityUid target, int spesoAmount,
int payout = sectorDD.FUCAccumulator.Int();
sectorDD.FUCAccumulator -= payout;

var stackPrototype = _prototypeManager.Index<StackPrototype>("FrontierUplinkCoin");
var stackPrototype = _prototypeManager.Index<StackPrototype>("SplenduriumCoin");
_stackSystem.Spawn(payout, stackPrototype, Transform(target).Coordinates);
}
}
Expand All @@ -133,7 +151,7 @@ private void GiveReward(EntityUid uidOrigin, EntityUid target, int spesoAmount,
{
msgString = msgString + " " + Loc.GetString("forensic-reward-amount",
("spesos", BankSystemExtensions.ToSpesoString(spesoAmount)),
("fuc", BankSystemExtensions.ToFUCString(fucAmount.Int())));
("fuc", BankSystemExtensions. ToFUCString(fucAmount.Int())));
}
else
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public sealed partial class ContrabandPriceGunComponent : Component
/// The currency that scanned items will be checked for.
/// </summary>
[DataField(customTypeSerializer: typeof(PrototypeIdSerializer<CurrencyPrototype>))]
public string Currency = "FrontierUplinkCoin";
public string Currency = "SplenduriumCoin";

/// <summary>
/// The prefix for localization strings to display.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Content.Shared._NF.Contraband.Components;
public sealed partial class ContrabandPalletConsoleComponent : Component
{
[ViewVariables(VVAccess.ReadWrite), DataField("cashType", serverOnly: true, customTypeSerializer:typeof(PrototypeIdSerializer<StackPrototype>))]
public string RewardType = "FrontierUplinkCoin";
public string RewardType = "SplenduriumCoin";

[ViewVariables(VVAccess.ReadWrite), DataField(serverOnly: true)]
public string Faction = "NFSD";
Expand Down
8 changes: 4 additions & 4 deletions Resources/Locale/en-US/_NF/cargo/price-gun-component.ftl
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
contraband-price-gun-pricing-result = The device deems {THE($object)} to be worth {$price ->
[0] no FUCs.
[one] {$price} FUC.
*[other] {$price} FUCs.
[0] nothing.
[one] {$price} Splendurium.
*[other] {$price} Splendurium.
}

contraband-price-gun-verb-text = Appraisal
contraband-price-gun-verb-message = Appraise {THE($object)}.
contraband-price-gun-pricing-result-none = The device deems {THE($object)} to be worth no FUCs.
contraband-price-gun-pricing-result-none = The device deems {THE($object)} to be worth no splendurium.

pirate-contraband-price-gun-pricing-result = Skizzit's says {THE($object)} {$price ->
[0] isn't worth any doubloons.
Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/_NF/store/currency.ftl
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
store-currency-display-security-telecrystal = FUC
store-currency-display-security-telecrystal = SPL
store-currency-display-pirate-telecrystal = DB
150 changes: 66 additions & 84 deletions Resources/Maps/_Null/POI/lodge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ meta:
engineVersion: 260.2.0
forkId: ""
forkVersion: ""
time: 08/10/2025 06:32:11
time: 10/31/2025 23:13:55
entityCount: 2724
maps: []
grids:
Expand Down Expand Up @@ -148,7 +148,6 @@ entities:
680: 15,10
1682: 13,22
1683: -13,22
1684: 0,2
- node:
color: '#52B4E996'
id: BotGreyscale
Expand Down Expand Up @@ -706,28 +705,6 @@ entities:
580: -3,0
581: -3,0
582: -2,0
583: 0,1
584: 1,1
585: 1,1
586: 0,0
587: 0,0
588: 0,1
589: -1,2
590: -1,1
591: -2,1
592: -3,1
593: 1,0
594: 2,1
595: 2,1
596: 0,0
597: 0,1
598: -1,1
599: -1,2
600: 0,2
601: -2,1
602: -3,1
603: 1,0
604: 3,1
605: 16,1
606: 17,1
607: 15,0
Expand Down Expand Up @@ -880,14 +857,12 @@ entities:
134: -5,0
135: -7,0
136: -3,0
137: -3,1
138: -2,2
139: -2,3
140: -2,4
141: -3,4
142: -3,2
143: -2,3
144: 0,2
145: 1,2
146: -1,0
147: -3,0
Expand Down Expand Up @@ -1547,7 +1522,6 @@ entities:
286: 8,4
287: 6,4
288: 5,4
289: 1,1
290: -1,0
291: -3,0
292: -4,1
Expand Down Expand Up @@ -1842,7 +1816,6 @@ entities:
396: -1,-3
397: 0,-3
398: 1,-3
399: -2,1
400: -5,0
401: -7,2
402: -9,3
Expand Down Expand Up @@ -1999,7 +1972,6 @@ entities:
364: -7,1
365: -4,0
366: -2,2
367: 1,1
368: 2,0
369: 5,0
370: 7,1
Expand Down Expand Up @@ -2539,6 +2511,71 @@ entities:
decals:
1052: -12,14
1053: -12,15
- node:
color: '#FFFFFFFF'
id: NullSignLodge1
decals:
2355: -1,2
- node:
color: '#FFFFFFFF'
id: NullSignLodge10
decals:
2347: 3,1
- node:
color: '#FFFFFFFF'
id: NullSignLodge11
decals:
2344: -1,0
- node:
color: '#FFFFFFFF'
id: NullSignLodge12
decals:
2345: 0,0
- node:
color: '#FFFFFFFF'
id: NullSignLodge13
decals:
2346: 1,0
- node:
color: '#FFFFFFFF'
id: NullSignLodge2
decals:
2342: 0,2
- node:
color: '#FFFFFFFF'
id: NullSignLodge3
decals:
2343: 1,2
- node:
color: '#FFFFFFFF'
id: NullSignLodge4
decals:
2348: -3,1
- node:
color: '#FFFFFFFF'
id: NullSignLodge5
decals:
2349: -2,1
- node:
color: '#FFFFFFFF'
id: NullSignLodge6
decals:
2350: -1,1
- node:
color: '#FFFFFFFF'
id: NullSignLodge7
decals:
2351: 0,1
- node:
color: '#FFFFFFFF'
id: NullSignLodge8
decals:
2354: 1,1
- node:
color: '#FFFFFFFF'
id: NullSignLodge9
decals:
2353: 2,1
- node:
color: '#7B7B3FFF'
id: QuarterTileOverlayGreyscale
Expand Down Expand Up @@ -2591,61 +2628,6 @@ entities:
967: 18,1
1991: 6,22
1994: -8,22
- node:
color: '#FFFFFFFF'
id: SpaceStationSign1
decals:
10: -1,2
- node:
color: '#FFFFFFFF'
id: SpaceStationSign10
decals:
9: 0,0
- node:
color: '#FFFFFFFF'
id: SpaceStationSign11
decals:
8: 1,0
- node:
color: '#FFFFFFFF'
id: SpaceStationSign2
decals:
7: 0,2
- node:
color: '#FFFFFFFF'
id: SpaceStationSign3
decals:
0: -3,1
- node:
color: '#FFFFFFFF'
id: SpaceStationSign4
decals:
1: -2,1
- node:
color: '#FFFFFFFF'
id: SpaceStationSign5
decals:
2: -1,1
- node:
color: '#FFFFFFFF'
id: SpaceStationSign6
decals:
3: 0,1
- node:
color: '#FFFFFFFF'
id: SpaceStationSign7
decals:
4: 1,1
- node:
color: '#FFFFFFFF'
id: SpaceStationSign8
decals:
5: 2,1
- node:
color: '#FFFFFFFF'
id: SpaceStationSign9
decals:
6: 3,1
- node:
color: '#7B7B3FFF'
id: ThreeQuarterTileOverlayGreyscale
Expand Down
Loading
Loading