Skip to content

Commit ab93ebc

Browse files
ShadesMarsShadesMars
authored
Merge pull request #1702 from ss14Starlight/starlight-dev
Stable Patch
2 parents 9b16e16 + ed85486 commit ab93ebc

33 files changed

Lines changed: 777 additions & 490 deletions

File tree

‎Content.Server/Spider/SpiderSystem.cs‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -101,21 +101,24 @@ private bool SpawnWeb(Entity<SpiderComponent> ent, EntityCoordinates coords)
101101
result = true;
102102
}
103103

104-
if (ent.Comp.OneWebSpawn) // Starlight-edit: we spawn only one web in center
105-
return result;
106-
107-
// Spawn web in other directions
108-
for (var i = 0; i < 4; i++)
104+
// Starlight-start: we spawn only one web in center
105+
if (ent.Comp.OneWebSpawn)
109106
{
110-
var direction = (DirectionFlag)(1 << i);
111-
var outerSpawnCoordinates = coords.Offset(direction.AsDir().ToVec());
112107

113-
if (IsTileBlockedByWeb(outerSpawnCoordinates))
114-
continue;
108+
// Spawn web in other directions
109+
for (var i = 0; i < 4; i++)
110+
{
111+
var direction = (DirectionFlag)(1 << i);
112+
var outerSpawnCoordinates = coords.Offset(direction.AsDir().ToVec());
115113

116-
Spawn(ent.Comp.WebPrototype, outerSpawnCoordinates);
117-
result = true;
114+
if (IsTileBlockedByWeb(outerSpawnCoordinates))
115+
continue;
116+
117+
Spawn(ent.Comp.WebPrototype, outerSpawnCoordinates);
118+
result = true;
119+
}
118120
}
121+
// Starlight-end
119122

120123
// Starlight-start
121124
if (result)

‎Content.Server/_Starlight/Antags/Actions/EMPScreamSystem.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,11 @@ public override void Initialize()
2929

3030
private void OnEMPScream(EMPScreamEvent ev)
3131
{
32-
if (ev.Handled || _chargesSystem.GetCurrentCharges(ev.Action.Owner) == 0)
32+
if (ev.Handled)
3333
return;
3434

3535
ev.Handled = true;
36+
3637
var uid = ev.Performer;
3738

3839
ScreamEffect(uid, ev.Power, ev.ScreamSound);

‎Content.Server/_Starlight/NPC/HTN/PrimitiveTasks/Operators/JumpOperator.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using Content.Server.NPC.HTN;
44
using Content.Server.NPC.HTN.PrimitiveTasks;
55
using Content.Shared._Starlight.Actions.Jump;
6+
using Content.Shared.Throwing;
67
using Robust.Shared.Map;
78

89
namespace Content.Server._Starlight.NPC.HTN.PrimitiveTasks.Operators;
@@ -59,7 +60,10 @@ public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTi
5960
{
6061
var owner = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
6162
if (!_entManager.TryGetComponent<JumpComponent>(owner, out var jump))
62-
return HTNOperatorStatus.Failed;
63+
return HTNOperatorStatus.Finished; // If we can't jump, we finish this.
64+
65+
if (_entManager.TryGetComponent<ThrownItemComponent>(owner, out var thrown) && !thrown.Landed)
66+
return HTNOperatorStatus.Continuing;
6367

6468
return HTNOperatorStatus.Finished;
6569
}

‎Content.Shared/Paper/PaperSystem.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,8 @@ private void AddSignVerb(Entity<PaperComponent> uid, ref GetVerbsEvent<Alternati
327327
{
328328
TrySign(uid, user);
329329
},
330-
Text = Loc.GetString("paper-component-verb-sign")
330+
Text = Loc.GetString("paper-component-verb-sign"),
331+
Priority = 4
331332
// Icon = Don't have an icon yet. Todo for later.
332333
};
333334
args.Verbs.Add(verb);

‎Content.Shared/_Starlight/Actions/Jump/JumpComponent.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,15 @@ public sealed partial class JumpComponent : Component
2020
[DataField]
2121
public bool KnockdownTargetOnCollision = false;
2222

23+
[DataField]
24+
public float KnockdownTargetDuration = 1f;
25+
2326
[DataField]
2427
public bool KnockdownSelfOnCollision = false;
2528

29+
[DataField]
30+
public float KnockdownSelfDuration = 1f;
31+
2632
[DataField]
2733
public float Cooldown = 30f;
2834
}

‎Content.Shared/_Starlight/Actions/Jump/SharedJumpSystem.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ public override void Initialize()
4040
private void OnThrowCollide(EntityUid uid, JumpComponent component, ref ThrowDoHitEvent args)
4141
{
4242
if (component.KnockdownSelfOnCollision)
43-
_stun.TryKnockdown(uid, TimeSpan.FromSeconds(2), true);
43+
_stun.TryKnockdown(uid, TimeSpan.FromSeconds(component.KnockdownSelfDuration), true);
4444

4545
if (component.KnockdownTargetOnCollision)
46-
_stun.TryKnockdown(args.Target, TimeSpan.FromSeconds(2), true);
46+
_stun.TryKnockdown(args.Target, TimeSpan.FromSeconds(component.KnockdownTargetDuration), true);
4747
}
4848

4949
private void OnGetItemActions(Entity<JumpComponent> ent, ref GetItemActionsEvent args)

‎Resources/Changelog/ChangelogStarlight.yml‎

Lines changed: 170 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14753,5 +14753,175 @@ Entries:
1475314753
id: 166201
1475414754
time: '2025-09-18T22:21:33.000000+00:00'
1475514755
url: https://github.com/ss14Starlight/space-station-14/pull/1662
14756+
- author: CrazyPhantom
14757+
changes:
14758+
- message: Practice Laser Carbine Nerfed Into Oblivion (20 heat to 1)
14759+
type: Fix
14760+
id: 168000
14761+
time: '2025-09-19T01:14:47.000000+00:00'
14762+
url: https://github.com/ss14Starlight/space-station-14/pull/1680
14763+
- author: Rinary
14764+
changes:
14765+
- message: Fixed emp scream cooldown for purple terror.
14766+
type: Fix
14767+
id: 168600
14768+
time: '2025-09-19T16:16:39.000000+00:00'
14769+
url: https://github.com/ss14Starlight/space-station-14/pull/1686
14770+
- author: Rinary
14771+
changes:
14772+
- message: Fixed npc's with jumping task, now they work.(Hostile)
14773+
type: Fix
14774+
id: 168601
14775+
time: '2025-09-19T16:16:39.000000+00:00'
14776+
url: https://github.com/ss14Starlight/space-station-14/pull/1686
14777+
- author: Rinary
14778+
changes:
14779+
- message: Changed black terror jump knockdown duration from 2 seconds to 1 seconds.
14780+
type: Tweak
14781+
id: 168602
14782+
time: '2025-09-19T16:16:39.000000+00:00'
14783+
url: https://github.com/ss14Starlight/space-station-14/pull/1686
14784+
- author: Rinary
14785+
changes:
14786+
- message: Fixed web condition at evolving system.
14787+
type: Fix
14788+
id: 168700
14789+
time: '2025-09-19T18:08:03.000000+00:00'
14790+
url: https://github.com/ss14Starlight/space-station-14/pull/1687
14791+
- author: CorruptOmega
14792+
changes:
14793+
- message: 'Scurrets now can understand Galactic Common again. Translation: Wawa,
14794+
wawaaaawa. Wawa!'
14795+
type: Tweak
14796+
id: 167300
14797+
time: '2025-09-19T20:43:08.000000+00:00'
14798+
url: https://github.com/ss14Starlight/space-station-14/pull/1673
14799+
- author: CorruptOmega
14800+
changes:
14801+
- message: All Documents within the Document Printer have been updated with new
14802+
"Forms and Fields" functionality.
14803+
type: Tweak
14804+
id: 168400
14805+
time: '2025-09-19T22:54:25.000000+00:00'
14806+
url: https://github.com/ss14Starlight/space-station-14/pull/1684
14807+
- author: CorruptOmega
14808+
changes:
14809+
- message: All Documents were given a bit of cleanup for formatting/grammar.
14810+
type: Tweak
14811+
id: 168401
14812+
time: '2025-09-19T22:54:25.000000+00:00'
14813+
url: https://github.com/ss14Starlight/space-station-14/pull/1684
14814+
- author: STARLIGHT TEAM
14815+
changes:
14816+
- message: FMJ deals slightly less damage.
14817+
type: Tweak
14818+
id: 155200
14819+
time: '2025-09-20T15:47:41.000000+00:00'
14820+
url: https://github.com/ss14Starlight/space-station-14/pull/1552
14821+
- author: STARLIGHT TEAM
14822+
changes:
14823+
- message: HP deals most of its damage as blunt.
14824+
type: Tweak
14825+
id: 155201
14826+
time: '2025-09-20T15:47:41.000000+00:00'
14827+
url: https://github.com/ss14Starlight/space-station-14/pull/1552
14828+
- author: CorruptOmega
14829+
changes:
14830+
- message: A bottle of Bone Gel is now included in Reaper Arms.
14831+
type: Tweak
14832+
id: 155600
14833+
time: '2025-09-20T15:48:39.000000+00:00'
14834+
url: https://github.com/ss14Starlight/space-station-14/pull/1556
14835+
- author: walksanatora
14836+
changes:
14837+
- message: Alt-Click now signs papers again.
14838+
type: Fix
14839+
id: 170000
14840+
time: '2025-09-21T01:04:19.000000+00:00'
14841+
url: https://github.com/ss14Starlight/space-station-14/pull/1700
14842+
- author: walksanatora
14843+
changes:
14844+
- message: Nanotransen Rep's cane can now be used as a mobility aid
14845+
type: Fix
14846+
id: 169700
14847+
time: '2025-09-21T01:03:36.000000+00:00'
14848+
url: https://github.com/ss14Starlight/space-station-14/pull/1697
14849+
- author: walksanatora
14850+
changes:
14851+
- message: Vulps now can take eye implants, tongues, and chest cavity items again.
14852+
type: Fix
14853+
id: 169800
14854+
time: '2025-09-21T01:01:59.000000+00:00'
14855+
url: https://github.com/ss14Starlight/space-station-14/pull/1698
14856+
- author: Trep_Maul
14857+
changes:
14858+
- message: Parole to Sec SOP
14859+
type: Add
14860+
id: 170100
14861+
time: '2025-09-21T01:05:39.000000+00:00'
14862+
url: https://github.com/ss14Starlight/space-station-14/pull/1701
14863+
- author: Trep_Maul
14864+
changes:
14865+
- message: Permit Acquisition to Sec SOP
14866+
type: Add
14867+
id: 170101
14868+
time: '2025-09-21T01:05:39.000000+00:00'
14869+
url: https://github.com/ss14Starlight/space-station-14/pull/1701
14870+
- author: Trep_Maul
14871+
changes:
14872+
- message: Enemy of Corporation to Crimes
14873+
type: Add
14874+
id: 170102
14875+
time: '2025-09-21T01:05:39.000000+00:00'
14876+
url: https://github.com/ss14Starlight/space-station-14/pull/1701
14877+
- author: Trep_Maul
14878+
changes:
14879+
- message: Modified syndicate contra
14880+
type: Tweak
14881+
id: 170103
14882+
time: '2025-09-21T01:05:39.000000+00:00'
14883+
url: https://github.com/ss14Starlight/space-station-14/pull/1701
14884+
- author: Trep_Maul
14885+
changes:
14886+
- message: Major adjustments to Rule 6, Nicknames!
14887+
type: Tweak
14888+
id: 170104
14889+
time: '2025-09-21T01:05:39.000000+00:00'
14890+
url: https://github.com/ss14Starlight/space-station-14/pull/1701
14891+
- author: Trep_Maul
14892+
changes:
14893+
- message: Major Adjustment to Rule 12, Thaven!
14894+
type: Tweak
14895+
id: 170105
14896+
time: '2025-09-21T01:05:39.000000+00:00'
14897+
url: https://github.com/ss14Starlight/space-station-14/pull/1701
14898+
- author: Trep_Maul
14899+
changes:
14900+
- message: Major Adjustment to Rule 13, Security!
14901+
type: Tweak
14902+
id: 170106
14903+
time: '2025-09-21T01:05:39.000000+00:00'
14904+
url: https://github.com/ss14Starlight/space-station-14/pull/1701
14905+
- author: Trep_Maul
14906+
changes:
14907+
- message: Minor adjustments to rules
14908+
type: Tweak
14909+
id: 170107
14910+
time: '2025-09-21T01:05:39.000000+00:00'
14911+
url: https://github.com/ss14Starlight/space-station-14/pull/1701
14912+
- author: Trep_Maul
14913+
changes:
14914+
- message: Major Adjustments to Corporate Law and punishments.
14915+
type: Tweak
14916+
id: 170108
14917+
time: '2025-09-21T01:05:39.000000+00:00'
14918+
url: https://github.com/ss14Starlight/space-station-14/pull/1701
14919+
- author: RoadTrain
14920+
changes:
14921+
- message: Actually fixes the laser carbine by moving our code to the abstract laser.
14922+
type: Fix
14923+
id: 168300
14924+
time: '2025-09-20T15:45:43.000000+00:00'
14925+
url: https://github.com/ss14Starlight/space-station-14/pull/1683
1475614926
Order: -1
1475714927

‎Resources/Locale/en-US/_Starlight/guidebook/guides.ftl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ guide-entry-sl-security-sop-brigmedic = Brigmedic
7272
guide-entry-sl-security-sop-warden = Warden
7373
guide-entry-sl-security-sop-headofsecurity = Head of Security
7474
guide-entry-sl-security-sop-prisonertreatment = Prisoner Treatment
75+
guide-entry-sl-security-sop-parole = Parole
76+
guide-entry-sl-security-sop-permitacquisition = Permit Acquisiton
7577
7678
guide-entry-sl-legal-sop-intro = Legal
7779

0 commit comments

Comments
 (0)