Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
eb5e611
hitscan
StarlightHost Sep 5, 2025
08aad1e
Reaper Arms now include bone gel
CorruptOmega Sep 5, 2025
497c07b
Update Scurret to understand Galactic Common
CorruptOmega Sep 18, 2025
6fce35a
Practice Laser Rifle Nerf
CrazyPhantom779 Sep 19, 2025
8abb132
Merge pull request #1680 from CrazyPhantom779/Practice-Laser-Rifle-Nerf
StarlightHost Sep 19, 2025
cd814a0
Update changelog for PR #1680 [skip ci]
github-actions[bot] Sep 19, 2025
99f0e9a
Unfucks wizden's crap (WHY DID THEY SWAP PROTO LOCATIONS)
Road-Train Sep 19, 2025
00b2dbe
starlight comment
Road-Train Sep 19, 2025
721442d
Update doc-printer.ftl
CorruptOmega Sep 19, 2025
cf97175
Slight Adjustment to clarify Document Compiler
CorruptOmega Sep 19, 2025
d301023
fix emp scream charges
Rinary1 Sep 19, 2025
79af716
fix jump + emp scream
Rinary1 Sep 19, 2025
6e92225
reduce knockdown duration
Rinary1 Sep 19, 2025
3b99ec9
Merge pull request #1686 from ss14Starlight/terror-spiders-tier-3
StarlightHost Sep 19, 2025
c4bea78
Update changelog for PR #1686 [skip ci]
github-actions[bot] Sep 19, 2025
71944ab
fix webs condition
Rinary1 Sep 19, 2025
0239704
Merge pull request #1687 from ss14Starlight/terror-spiders-tier-3
StarlightHost Sep 19, 2025
c5ade87
Update changelog for PR #1687 [skip ci]
github-actions[bot] Sep 19, 2025
cd1c36f
Updated Chapters Meeting for Signatures Instead
CorruptOmega Sep 19, 2025
590d11f
Merge pull request #1673 from CorruptOmega/Scurrets-Understanding
ShadesMars Sep 19, 2025
de427fc
Update changelog for PR #1673 [skip ci]
github-actions[bot] Sep 19, 2025
c4182a9
Merge pull request #1684 from CorruptOmega/Update-Documents-Temporarily
ShadesMars Sep 19, 2025
52f66c7
Update changelog for PR #1684 [skip ci]
github-actions[bot] Sep 19, 2025
cc35e12
Merge pull request #1683 from Road-Train/carbine-fix-real
ShadesMars Sep 20, 2025
f954329
Merge pull request #1552 from ss14Starlight/ranged/tweak
ShadesMars Sep 20, 2025
c11b217
Merge pull request #1556 from CorruptOmega/Reaper-Gel
ShadesMars Sep 20, 2025
c70e8ac
Update changelog for PR #1552 [skip ci]
github-actions[bot] Sep 20, 2025
7de1032
Update changelog for PR #1556 [skip ci]
github-actions[bot] Sep 20, 2025
32fb28a
yes the cane is a cane
walksanatora Sep 20, 2025
b224b3d
major rules revision.
APOCAMANDER Sep 20, 2025
e977285
vulps can now get all the surgeries as expected.
walksanatora Sep 20, 2025
b8eff2a
major corporate law update
APOCAMANDER Sep 20, 2025
634bb61
SOP update
APOCAMANDER Sep 20, 2025
1b9c837
sign a paper if you have a pen.
walksanatora Sep 20, 2025
449e2db
finished up the crime list. Made formatting all correct. Double check…
APOCAMANDER Sep 20, 2025
209404e
Merge pull request #1698 from walksanatora/vulp-surgery
ShadesMars Sep 21, 2025
bd022cf
Merge pull request #1697 from walksanatora/cane-fix
ShadesMars Sep 21, 2025
3d6fdb7
Merge pull request #1700 from walksanatora/sign-dont-eat
ShadesMars Sep 21, 2025
6ba7092
Merge pull request #1701 from APOCAMANDER/guidebookrevision
ShadesMars Sep 21, 2025
61b96dc
Update changelog for PR #1700 [skip ci]
github-actions[bot] Sep 21, 2025
b69167a
Update changelog for PR #1697 [skip ci]
github-actions[bot] Sep 21, 2025
1237c18
Update changelog for PR #1698 [skip ci]
github-actions[bot] Sep 21, 2025
cbfeb51
Update changelog for PR #1701 [skip ci]
github-actions[bot] Sep 21, 2025
ed85486
Update changelog for PR #1683 [skip ci]
github-actions[bot] Sep 21, 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
25 changes: 14 additions & 11 deletions Content.Server/Spider/SpiderSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -101,21 +101,24 @@ private bool SpawnWeb(Entity<SpiderComponent> ent, EntityCoordinates coords)
result = true;
}

if (ent.Comp.OneWebSpawn) // Starlight-edit: we spawn only one web in center
return result;

// Spawn web in other directions
for (var i = 0; i < 4; i++)
// Starlight-start: we spawn only one web in center
if (ent.Comp.OneWebSpawn)
{
var direction = (DirectionFlag)(1 << i);
var outerSpawnCoordinates = coords.Offset(direction.AsDir().ToVec());

if (IsTileBlockedByWeb(outerSpawnCoordinates))
continue;
// Spawn web in other directions
for (var i = 0; i < 4; i++)
{
var direction = (DirectionFlag)(1 << i);
var outerSpawnCoordinates = coords.Offset(direction.AsDir().ToVec());

Spawn(ent.Comp.WebPrototype, outerSpawnCoordinates);
result = true;
if (IsTileBlockedByWeb(outerSpawnCoordinates))
continue;

Spawn(ent.Comp.WebPrototype, outerSpawnCoordinates);
result = true;
}
}
// Starlight-end

// Starlight-start
if (result)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@ public override void Initialize()

private void OnEMPScream(EMPScreamEvent ev)
{
if (ev.Handled || _chargesSystem.GetCurrentCharges(ev.Action.Owner) == 0)
if (ev.Handled)
return;

ev.Handled = true;

var uid = ev.Performer;

ScreamEffect(uid, ev.Power, ev.ScreamSound);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using Content.Server.NPC.HTN;
using Content.Server.NPC.HTN.PrimitiveTasks;
using Content.Shared._Starlight.Actions.Jump;
using Content.Shared.Throwing;
using Robust.Shared.Map;

namespace Content.Server._Starlight.NPC.HTN.PrimitiveTasks.Operators;
Expand Down Expand Up @@ -59,7 +60,10 @@ public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTi
{
var owner = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
if (!_entManager.TryGetComponent<JumpComponent>(owner, out var jump))
return HTNOperatorStatus.Failed;
return HTNOperatorStatus.Finished; // If we can't jump, we finish this.

if (_entManager.TryGetComponent<ThrownItemComponent>(owner, out var thrown) && !thrown.Landed)
return HTNOperatorStatus.Continuing;

return HTNOperatorStatus.Finished;
}
Expand Down
3 changes: 2 additions & 1 deletion Content.Shared/Paper/PaperSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,8 @@ private void AddSignVerb(Entity<PaperComponent> uid, ref GetVerbsEvent<Alternati
{
TrySign(uid, user);
},
Text = Loc.GetString("paper-component-verb-sign")
Text = Loc.GetString("paper-component-verb-sign"),
Priority = 4
// Icon = Don't have an icon yet. Todo for later.
};
args.Verbs.Add(verb);
Expand Down
6 changes: 6 additions & 0 deletions Content.Shared/_Starlight/Actions/Jump/JumpComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,15 @@ public sealed partial class JumpComponent : Component
[DataField]
public bool KnockdownTargetOnCollision = false;

[DataField]
public float KnockdownTargetDuration = 1f;

[DataField]
public bool KnockdownSelfOnCollision = false;

[DataField]
public float KnockdownSelfDuration = 1f;

[DataField]
public float Cooldown = 30f;
}
4 changes: 2 additions & 2 deletions Content.Shared/_Starlight/Actions/Jump/SharedJumpSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ public override void Initialize()
private void OnThrowCollide(EntityUid uid, JumpComponent component, ref ThrowDoHitEvent args)
{
if (component.KnockdownSelfOnCollision)
_stun.TryKnockdown(uid, TimeSpan.FromSeconds(2), true);
_stun.TryKnockdown(uid, TimeSpan.FromSeconds(component.KnockdownSelfDuration), true);

if (component.KnockdownTargetOnCollision)
_stun.TryKnockdown(args.Target, TimeSpan.FromSeconds(2), true);
_stun.TryKnockdown(args.Target, TimeSpan.FromSeconds(component.KnockdownTargetDuration), true);
}

private void OnGetItemActions(Entity<JumpComponent> ent, ref GetItemActionsEvent args)
Expand Down
170 changes: 170 additions & 0 deletions Resources/Changelog/ChangelogStarlight.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14753,5 +14753,175 @@ Entries:
id: 166201
time: '2025-09-18T22:21:33.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1662
- author: CrazyPhantom
changes:
- message: Practice Laser Carbine Nerfed Into Oblivion (20 heat to 1)
type: Fix
id: 168000
time: '2025-09-19T01:14:47.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1680
- author: Rinary
changes:
- message: Fixed emp scream cooldown for purple terror.
type: Fix
id: 168600
time: '2025-09-19T16:16:39.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1686
- author: Rinary
changes:
- message: Fixed npc's with jumping task, now they work.(Hostile)
type: Fix
id: 168601
time: '2025-09-19T16:16:39.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1686
- author: Rinary
changes:
- message: Changed black terror jump knockdown duration from 2 seconds to 1 seconds.
type: Tweak
id: 168602
time: '2025-09-19T16:16:39.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1686
- author: Rinary
changes:
- message: Fixed web condition at evolving system.
type: Fix
id: 168700
time: '2025-09-19T18:08:03.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1687
- author: CorruptOmega
changes:
- message: 'Scurrets now can understand Galactic Common again. Translation: Wawa,
wawaaaawa. Wawa!'
type: Tweak
id: 167300
time: '2025-09-19T20:43:08.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1673
- author: CorruptOmega
changes:
- message: All Documents within the Document Printer have been updated with new
"Forms and Fields" functionality.
type: Tweak
id: 168400
time: '2025-09-19T22:54:25.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1684
- author: CorruptOmega
changes:
- message: All Documents were given a bit of cleanup for formatting/grammar.
type: Tweak
id: 168401
time: '2025-09-19T22:54:25.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1684
- author: STARLIGHT TEAM
changes:
- message: FMJ deals slightly less damage.
type: Tweak
id: 155200
time: '2025-09-20T15:47:41.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1552
- author: STARLIGHT TEAM
changes:
- message: HP deals most of its damage as blunt.
type: Tweak
id: 155201
time: '2025-09-20T15:47:41.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1552
- author: CorruptOmega
changes:
- message: A bottle of Bone Gel is now included in Reaper Arms.
type: Tweak
id: 155600
time: '2025-09-20T15:48:39.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1556
- author: walksanatora
changes:
- message: Alt-Click now signs papers again.
type: Fix
id: 170000
time: '2025-09-21T01:04:19.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1700
- author: walksanatora
changes:
- message: Nanotransen Rep's cane can now be used as a mobility aid
type: Fix
id: 169700
time: '2025-09-21T01:03:36.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1697
- author: walksanatora
changes:
- message: Vulps now can take eye implants, tongues, and chest cavity items again.
type: Fix
id: 169800
time: '2025-09-21T01:01:59.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1698
- author: Trep_Maul
changes:
- message: Parole to Sec SOP
type: Add
id: 170100
time: '2025-09-21T01:05:39.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1701
- author: Trep_Maul
changes:
- message: Permit Acquisition to Sec SOP
type: Add
id: 170101
time: '2025-09-21T01:05:39.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1701
- author: Trep_Maul
changes:
- message: Enemy of Corporation to Crimes
type: Add
id: 170102
time: '2025-09-21T01:05:39.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1701
- author: Trep_Maul
changes:
- message: Modified syndicate contra
type: Tweak
id: 170103
time: '2025-09-21T01:05:39.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1701
- author: Trep_Maul
changes:
- message: Major adjustments to Rule 6, Nicknames!
type: Tweak
id: 170104
time: '2025-09-21T01:05:39.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1701
- author: Trep_Maul
changes:
- message: Major Adjustment to Rule 12, Thaven!
type: Tweak
id: 170105
time: '2025-09-21T01:05:39.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1701
- author: Trep_Maul
changes:
- message: Major Adjustment to Rule 13, Security!
type: Tweak
id: 170106
time: '2025-09-21T01:05:39.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1701
- author: Trep_Maul
changes:
- message: Minor adjustments to rules
type: Tweak
id: 170107
time: '2025-09-21T01:05:39.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1701
- author: Trep_Maul
changes:
- message: Major Adjustments to Corporate Law and punishments.
type: Tweak
id: 170108
time: '2025-09-21T01:05:39.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1701
- author: RoadTrain
changes:
- message: Actually fixes the laser carbine by moving our code to the abstract laser.
type: Fix
id: 168300
time: '2025-09-20T15:45:43.000000+00:00'
url: https://github.com/ss14Starlight/space-station-14/pull/1683
Order: -1

2 changes: 2 additions & 0 deletions Resources/Locale/en-US/_Starlight/guidebook/guides.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ guide-entry-sl-security-sop-brigmedic = Brigmedic
guide-entry-sl-security-sop-warden = Warden
guide-entry-sl-security-sop-headofsecurity = Head of Security
guide-entry-sl-security-sop-prisonertreatment = Prisoner Treatment
guide-entry-sl-security-sop-parole = Parole
guide-entry-sl-security-sop-permitacquisition = Permit Acquisiton

guide-entry-sl-legal-sop-intro = Legal

Expand Down
Loading
Loading