Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
368f4eb
trackers
JustAdler Jul 11, 2025
0815077
crate
JustAdler Jul 12, 2025
a5d665a
Merge branch 'starlight-dev' into trackers
JustAdler Jul 28, 2025
a9246f7
fix
JustAdler Jul 30, 2025
c790358
equate
JustAdler Jul 30, 2025
7b3b7e7
Remove AdminOOC Colour Restriction
DoubleHypercube Jul 31, 2025
e47061a
Fixes Standee Plush
TheSnipingDwarf Jul 31, 2025
979fac0
all I need to do
Aug 1, 2025
61b9538
Roundstart leather satchel
DoubleHypercube Aug 1, 2025
b3e91df
Revert "Remove AdminOOC Colour Restriction"
DoubleHypercube Aug 1, 2025
6cd7ab8
Give it to everyone
DoubleHypercube Aug 1, 2025
2a3d93f
Merge branch 'starlight-dev' into clown-mask-trinket
Happyrobot33 Aug 2, 2025
a93d16b
Update coats.yml
Aug 2, 2025
a0b8e22
Update assistant.yml
Aug 2, 2025
b635027
Update glasses.yml
Aug 3, 2025
ddc73dc
Update detective.yml
Aug 3, 2025
e892c67
Update detective.yml
Aug 3, 2025
2dd456e
Update detective.yml
Aug 3, 2025
ecd0e8a
Update loadout_groups.yml
Aug 3, 2025
0a4d27c
Update assistant.yml
Aug 3, 2025
07060ea
Update loadout_groups.yml
Aug 3, 2025
f69e58f
Update coats.yml
Aug 3, 2025
0d543eb
Update glasses.yml
Aug 3, 2025
fb299a5
Update coats.yml
Aug 3, 2025
b2ae1e5
Create meta.json
Aug 3, 2025
81d8382
Add files via upload
Aug 3, 2025
a1a230e
Update coats.yml
Aug 3, 2025
7d09f45
Update coats.yml
Aug 3, 2025
1f36611
Update assistant.yml
Aug 3, 2025
c502f44
Update Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
JustAdler Aug 4, 2025
9162a7a
NTNC Gear
Conflee Aug 6, 2025
08f9a60
fix rsi
Conflee Aug 6, 2025
54ce599
Update trinkets.yml
Aug 8, 2025
ab98a57
Merge branch 'starlight-dev' into ntncmoregear
Conflee Aug 8, 2025
dd5b56c
add to loadouts
Conflee Aug 8, 2025
380c28c
Merge remote-tracking branch 'upstream/Starlight' into Starlight
TheSnipingDwarf Aug 10, 2025
bf15746
Update RobustToolbox
TheSnipingDwarf Aug 10, 2025
1b3d746
Fixes plush!
TheSnipingDwarf Aug 10, 2025
032cc78
weird conflict fix
TheSnipingDwarf Aug 10, 2025
15f1360
Update plushies.yml
TheSnipingDwarf Aug 10, 2025
2a32b36
robust
TheSnipingDwarf Aug 10, 2025
51ce543
reversion, weird merges happening.
TheSnipingDwarf Aug 10, 2025
64c119f
name change fix
TheSnipingDwarf Aug 10, 2025
8689881
Merge branch 'starlight-dev' into roundstart-leather-satchel
DoubleHypercube Aug 10, 2025
c61f8e0
small sprite change
TheSnipingDwarf Aug 10, 2025
063998a
Update 1 for Prism Station
MaxAlpine Aug 11, 2025
e3c9c0d
Merge branch 'starlight-dev' of https://github.com/MaxAlpine/starligh…
MaxAlpine Aug 11, 2025
199f46c
minor fixes
MaxAlpine Aug 11, 2025
1713d1c
remove demeaning playtime comments
Happyrobot33 Aug 11, 2025
a81fe0c
Merge branch 'ss14Starlight:starlight-dev' into starlight-dev
MaxAlpine Aug 12, 2025
7749623
minor tweaks and renamed much of the buttons and levers to better ref…
MaxAlpine Aug 12, 2025
049de68
reworked sec docking shuttle access
MaxAlpine Aug 12, 2025
6ad5198
Merge branch 'starlight-dev' into ntncmoregear
Rinary1 Aug 12, 2025
7641e65
fixing dumb mistakes and missing tiles
MaxAlpine Aug 12, 2025
6f0330f
Added structural damage to QM knuckledusters
Citrea-Lingua Aug 12, 2025
25099cf
Merge branch 'starlight-dev' into Fixes_plush
TheSnipingDwarf Aug 12, 2025
613e5ad
Added to vendor, naming tweaks to maintain parity
TheSnipingDwarf Aug 12, 2025
fbf8744
Merge branch 'starlight-dev' into Fixes_plush
TheSnipingDwarf Aug 12, 2025
eb5c516
Merge branch 'Fixes_plush' of https://github.com/TheSnipingDwarf/spac…
TheSnipingDwarf Aug 12, 2025
9938de0
Update Resources/Locale/en-US/lobby/lobby-state.ftl
Happyrobot33 Aug 14, 2025
1aa94a1
Merge branch 'starlight-dev' into ntncmoregear
Conflee Aug 14, 2025
b7e5d10
shitstation
Conflee Aug 14, 2025
edd3e3b
shitstation
Conflee Aug 14, 2025
2d82552
Merge branch 'ss14Starlight:starlight-dev' into starlight-dev
MaxAlpine Aug 14, 2025
f6f7c70
Added ninja bomb objective compontents to warp points
MaxAlpine Aug 14, 2025
a16f2bd
Re-Added lightning zap effect
TheSnipingDwarf Aug 14, 2025
03ecbfd
Merge branch 'starlight-dev' into Fixes_plush
TheSnipingDwarf Aug 14, 2025
2d89608
small item meta change
TheSnipingDwarf Aug 14, 2025
e0d15e6
Merge branch 'Fixes_plush' of https://github.com/TheSnipingDwarf/spac…
TheSnipingDwarf Aug 14, 2025
d483217
changed a single character because formatting is a bitch
TheSnipingDwarf Aug 14, 2025
33a4346
Fixed Zookeeper name Showing as Job-Name-Zookeeper
CrazyPhantom779 Aug 14, 2025
c426157
new textures
Conflee Aug 14, 2025
9c6c201
Merge pull request #1342 from CrazyPhantom779/Zookeeper-Name-Fix
Happyrobot33 Aug 14, 2025
6e9cf73
Update changelog for PR #1342 [skip ci]
github-actions[bot] Aug 14, 2025
d1efc5c
Merge pull request #1311 from Citrea-Lingua/steves_dusters
Happyrobot33 Aug 14, 2025
b994b91
Update changelog for PR #1311 [skip ci]
github-actions[bot] Aug 14, 2025
488d04c
Merge pull request #1301 from Happyrobot33/edit-playtime-locale
Happyrobot33 Aug 14, 2025
ddff871
Update changelog for PR #1301 [skip ci]
github-actions[bot] Aug 14, 2025
30617fc
Merge pull request #1019 from JustAdler/trackers
Happyrobot33 Aug 14, 2025
ac2898a
Update changelog for PR #1019 [skip ci]
github-actions[bot] Aug 14, 2025
634fd5e
Merge pull request #1175 from AutumnalModding/roundstart-leather-satchel
Happyrobot33 Aug 14, 2025
aeb48ed
Update changelog for PR #1175 [skip ci]
github-actions[bot] Aug 14, 2025
1c9406f
Merge pull request #1168 from stickycheZ101/clown-mask-trinket
Happyrobot33 Aug 14, 2025
8bf69ba
Update changelog for PR #1168 [skip ci]
github-actions[bot] Aug 14, 2025
ee4a5ee
Merge pull request #1281 from TheSnipingDwarf/Fixes_plush
Happyrobot33 Aug 14, 2025
9eeda07
Update changelog for PR #1281 [skip ci]
github-actions[bot] Aug 14, 2025
fc8510f
Merge pull request #1240 from Conflee/ntncmoregear
Happyrobot33 Aug 14, 2025
74f3616
Update changelog for PR #1240 [skip ci]
github-actions[bot] Aug 14, 2025
d32dcb4
Merge pull request #1299 from MaxAlpine/starlight-dev
Happyrobot33 Aug 14, 2025
d55b2dd
Merge pull request #1337 from Conflee/shitstation
Happyrobot33 Aug 14, 2025
d398eb5
Update changelog for PR #1337 [skip ci]
github-actions[bot] Aug 14, 2025
d9a20fa
Species statistics
Happyrobot33 Aug 15, 2025
bc8fa24
switch to gauge
Happyrobot33 Aug 15, 2025
95be357
Merge pull request #1347 from Happyrobot33/species-job-statistics
Happyrobot33 Aug 15, 2025
993f146
Update changelog for PR #1347 [skip ci]
github-actions[bot] Aug 15, 2025
f207e1c
funny fix, put it in the wrong spot entirely
Happyrobot33 Aug 15, 2025
7723a72
change to localized versions
Happyrobot33 Aug 15, 2025
7dda531
Merge branch 'Starlight' into starlight-dev
Happyrobot33 Aug 15, 2025
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
6 changes: 5 additions & 1 deletion Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
using Content.Server.GameTicking;
using Content.Server.Spawners.Components;
using Content.Server.Station.Systems;
using Content.Shared.Humanoid.Prototypes;
using Content.Shared.Roles;
using Prometheus;
using Robust.Shared.Map;
using Robust.Shared.Prototypes;
using Robust.Shared.Random;

namespace Content.Server.Spawners.EntitySystems;
Expand All @@ -27,7 +31,7 @@ private void OnPlayerSpawning(PlayerSpawningEvent args)
var points = EntityQueryEnumerator<SpawnPointComponent, TransformComponent>();
var possiblePositions = new List<EntityCoordinates>();

while ( points.MoveNext(out var uid, out var spawnPoint, out var xform))
while (points.MoveNext(out var uid, out var spawnPoint, out var xform))
{
if (args.Station != null && _stationSystem.GetOwningStation(uid, xform) != args.Station)
continue;
Expand Down
38 changes: 38 additions & 0 deletions Content.Server/Station/Systems/StationSpawningSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using Content.Server._Starlight.Medical.Limbs;
using Content.Server.Access.Systems;
using Content.Server.Body.Systems;
using Content.Server.GameTicking;
using Content.Server.Humanoid;
using Content.Server.IdentityManagement;
using Content.Server.Mind.Commands;
Expand All @@ -23,6 +24,7 @@
using Content.Shared.Starlight.TextToSpeech;
using Content.Shared.Station;
using JetBrains.Annotations;
using Prometheus;
using Robust.Shared.Configuration;
using Robust.Shared.Map;
using Robust.Shared.Player;
Expand Down Expand Up @@ -52,6 +54,17 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem

private List<CyberneticImplant> _allCybernetics = default!; // Starlight

#region Starlight
[Dependency] private readonly GameTicker _gameTicker = default!;
private static readonly ProtoId<SpeciesPrototype> FallbackSpecies = "Human";
private static readonly ProtoId<JobPrototype> FallbackJob = "Assistant";
private static readonly Gauge _speciesJobsSpawns = Metrics.CreateGauge(
"sl_species_jobs_spawns",
"Contains info on species and jobs spawned at and during the round.",
["species", "job", "spawn_time"]
);
#endregion

// Starlight
public override void Initialize()
{
Expand Down Expand Up @@ -181,6 +194,31 @@ public EntityUid SpawnPlayerMob(

DoJobSpecials(job, entity.Value);
_identity.QueueIdentityUpdate(entity.Value);

#region StarlightStats
if (entity.HasValue)
{
if (!_prototypeManager.TryIndex(profile?.Species, out SpeciesPrototype? speciesProto))
{
speciesProto = _prototypeManager.Index(FallbackSpecies);
Log.Warning($"Unable to find species {profile?.Species}, falling back to {FallbackSpecies}");
}

if (!_prototypeManager.TryIndex(job, out JobPrototype? jobProto))
{
jobProto = _prototypeManager.Index(FallbackJob);
Log.Warning($"Unable to find job {job}, falling back to {FallbackJob}");
}

_speciesJobsSpawns
.WithLabels(
Loc.GetString(speciesProto.Name),
jobProto.LocalizedName,
_gameTicker.RunLevel.ToString())
.Inc();
}
#endregion

return entity.Value;
}

Expand Down
118 changes: 118 additions & 0 deletions Resources/Changelog/ChangelogStarlight.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11479,5 +11479,123 @@ Entries:
id: 133900
time: '2025-08-14T20:07:43.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1339
- author: CrazyPhantom
changes:
- message: Zookeeper name displaying wrong
type: Fix
id: 134200
time: '2025-08-14T19:37:56.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1342
- author: Citrea
changes:
- message: Quartermasters can now destroy asteroids with the power of pure rage
(and their knuckle dusters)
type: Tweak
id: 131100
time: '2025-08-14T19:59:54.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1311
- author: Happyrobot33
changes:
- message: Removed demeaning comments about your playtime.
type: Tweak
id: 130100
time: '2025-08-14T20:02:19.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1301
- author: Aedler
changes:
- message: Decreased the number of available tracking implants in security and BSO
locker.
type: Tweak
id: 101900
time: '2025-08-14T20:23:54.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1019
- author: Aedler
changes:
- message: Tracking implant crate increased from 1000 to 2950 spesos.
type: Tweak
id: 101901
time: '2025-08-14T20:23:54.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1019
- author: Aedler
changes:
- message: Tracking implant crates now contain 6 tracking implants instead of 5.
type: Tweak
id: 101902
time: '2025-08-14T20:23:54.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1019
- author: Fractalflower
changes:
- message: Leather satchels on roundstart
type: Add
id: 117500
time: '2025-08-14T20:26:52.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1175
- author: stickycheZ101
changes:
- message: added a few more trinkets
type: Add
id: 116800
time: '2025-08-14T20:33:42.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1168
- author: stickycheZ101
changes:
- message: removed the pondering orb from loadouts
type: Remove
id: 116801
time: '2025-08-14T20:33:42.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1168
- author: stickycheZ101
changes:
- message: dried tobacco, cannabis, and rainbow cannabis leaves are now 1x1 (QoL
and to fix them not generating in one of the new trinkets)
type: Tweak
id: 116802
time: '2025-08-14T20:33:42.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1168
- author: stickycheZ101
changes:
- message: zippo lighters now fit in rollie packets
type: Fix
id: 116803
time: '2025-08-14T20:33:42.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1168
- author: stickycheZ101
changes:
- message: Supersynth now requires 100h overall playtime instead of 20h musician
type: Tweak
id: 116804
time: '2025-08-14T20:33:42.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1168
- author: TheSnipingDwarf
changes:
- message: Added Fixes Plushie.
type: Add
id: 128100
time: '2025-08-14T20:44:55.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1281
- author: Conflee & Abby
changes:
- message: Added the NTNC Chest Rig and NTNC Backpack, for Navy Admemes. Included
in the Loadouts for rapid-equipping.
type: Add
id: 124000
time: '2025-08-14T21:00:07.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1240
- author: Conflee
changes:
- message: Added Shit Station gamemode, a mostly normal gamemode except there is
more dirt, trash, spills, and broken lights round start (has vent events, mid
round antags, etc too)
type: Add
id: 133700
time: '2025-08-14T21:11:47.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1337
- author: Happyrobot33
changes:
- message: Added species/job statistics
type: Add
id: 134700
time: '2025-08-15T01:10:08.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1347
Order: -1

5 changes: 4 additions & 1 deletion Resources/Locale/en-US/_Starlight/gamerules.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@ traitorling-title = Traitorlings
traitorling-description = Traitors taste delicious

eventlight-title = Event Light
eventlight-description = Not quite Greenshift, stuff still happens!
eventlight-description = Not quite Greenshift, stuff still happens!

shitstation-title = Shit Station
shitstation-description = The last shift was full of slobs
1 change: 1 addition & 0 deletions Resources/Locale/en-US/job/job-names.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ job-name-station-ai = Station AI
job-name-technical-assistant = Technical Assistant
job-name-visitor = Visitor
job-name-cluwne = Cluwne
job-name-zookeeper = Zookeeper

# unused jobs
# these are required for the agent ID job icon tooltips
Expand Down
22 changes: 18 additions & 4 deletions Resources/Locale/en-US/lobby/lobby-state.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,25 @@ lobby-state-song-text = Playing: [color=white]{$songTitle}[/color] by [color=whi
lobby-state-song-no-song-text = No lobby song playing.
lobby-state-song-unknown-title = [color=dimgray]Unknown title[/color]
lobby-state-song-unknown-artist = [color=dimgray]Unknown artist[/color]

#starlight edit remove demeaning comments
lobby-state-playtime-comment-normal =
You've spent {$hours} {$hours ->
[1]hour
*[other]hours
} ingame today. Remember to take breaks!
lobby-state-playtime-comment-concerning = You've played for {$hours} hours today. Please take a break.
lobby-state-playtime-comment-grasstouchless = {$hours} hours. Consider logging off to attend to your needs.
lobby-state-playtime-comment-selfdestructive = {$hours} hours. Really?
} ingame today.
lobby-state-playtime-comment-concerning =
You've spent {$hours} {$hours ->
[1]hour
*[other]hours
} ingame today.
lobby-state-playtime-comment-grasstouchless =
You've spent {$hours} {$hours ->
[1]hour
*[other]hours
} ingame today.
lobby-state-playtime-comment-selfdestructive =
You've spent {$hours} {$hours ->
[1]hour
*[other]hours
} ingame today.
Loading
Loading