Skip to content

Commit 0894a70

Browse files
Rinary1Rinary1
authored
Live push (ss14Starlight#2887)
2 parents af52657 + dbd62f3 commit 0894a70

8 files changed

Lines changed: 109 additions & 6 deletions

File tree

‎Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ private void OnPostFlash(EntityUid uid, HeadRevolutionaryComponent comp, ref Aft
350350
if (!_mind.TryGetMind(ev.Target, out var mindId, out var mind) && !alwaysConvertible)
351351
return;
352352

353-
if (_whitelistSystem.CheckBoth(ev.Target, comp.Blacklist, comp.Whitelist) && // Starlight-edit: rework all has comp to whitelist & blacklist.
353+
if (!_whitelistSystem.CheckBoth(ev.Target, comp.Blacklist, comp.Whitelist) && // Starlight-edit: rework all has comp to whitelist & blacklist.
354354
!alwaysConvertible ||
355355
!_mobState.IsAlive(ev.Target))
356356
{

‎Content.Server/_Starlight/Gnome/GnomeSystem.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ private void OnInit(Entity<GnomeComponent> ent, ref MapInitEvent args)
4444

4545
private void OnEmote(Entity<GnomeComponent> ent, ref EmoteEvent args)
4646
{
47-
if (args.Handled) return;
47+
if (args.Handled || args.Emote.ID != "Scream") // If it's isn't our emote
48+
return;
4849

4950
// endless heheha
5051
_audio.PlayPvs(ent.Comp.GnomeSound, ent.Owner);

‎Resources/Audio/_Starlight/Items/Toys/gnome_hahe.ogg‎

-6.71 KB
Binary file not shown.

‎Resources/Changelog/ChangelogStarlight.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26965,5 +26965,12 @@ Entries:
2696526965
id: 285000
2696626966
time: '2026-01-20T01:25:17.000000+00:00'
2696726967
url: https://github.com/ss14Starlight/space-station-14/pull/2850
26968+
- author: Penguinwizzard
26969+
changes:
26970+
- message: Fixed ability to use the new gear denial implants while crit.
26971+
type: Fix
26972+
id: 288500
26973+
time: '2026-01-20T14:13:15.000000+00:00'
26974+
url: https://github.com/ss14Starlight/space-station-14/pull/2885
2696826975
Order: -1
2696926976

‎Resources/Prototypes/_StarLight/Actions/implant.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
state: gorilla_rampage
1717

1818
- type: entity
19-
parent: BaseImplantAction
19+
parent: [BaseMentalAction, BaseImplantAction]
2020
id: ActionActivateBluespaceImplant
2121
name: An advanced subdermal implant that, when activated, teleports the user far away.
2222
description: An advanced subdermal implant that, when activated, teleports the user far away.
@@ -34,7 +34,7 @@
3434
state: bluespace_implant
3535

3636
- type: entity
37-
parent: BaseImplantAction
37+
parent: [BaseMentalAction, BaseImplantAction]
3838
id: ActionActivateRedspaceImplant
3939
name: An advanced subdermal implant that, when activated, teleports the user far away.
4040
description: An advanced subdermal implant that, when activated, teleports the user far away.
@@ -53,7 +53,7 @@
5353

5454
# Gear Acidifier
5555
- type: entity
56-
parent: BaseImplantAction
56+
parent: [BaseMentalAction, BaseImplantAction]
5757
id: ActionActivateGearAcidifier
5858
name: Activate Gear-Acidifier
5959
description: Activates your gear-acidifier, melting your equipment but leaving your body intact

‎Resources/Prototypes/_StarLight/Entities/Mobs/Player/GhostThemes/personal.yml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,18 @@
5353
color: "#ffffff"
5454
requirements:
5555
- !type:UsernameRequirement
56-
username: Rinary
56+
username: Rinary
57+
58+
- type: ghostTheme
59+
id: pai_fox
60+
name: pai fox
61+
description: a cyber kitsune
62+
private: true
63+
spriteSpecifier:
64+
sprite:
65+
sprite: _Starlight/Mobs/Customization/GhostThemes/pai_fox.rsi
66+
state: pai_fox
67+
color: "#ffffff"
68+
requirements:
69+
- !type:UsernameRequirement
70+
username: KarmaKitsuna

‎Resources/Textures/_Starlight/Mobs/Customization/GhostThemes/pai_fox.rsi/meta.json‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
{
2+
"version": 1,
3+
"license": "CC-BY-SA-3.0",
4+
"copyright": "Taken from tg station",
5+
"size": {
6+
"x": 32,
7+
"y": 32
8+
},
9+
"states": [
10+
{
11+
"name": "pai_fox",
12+
"directions": 4,
13+
"delays": [
14+
[
15+
0.1,
16+
0.2,
17+
0.1,
18+
0.5,
19+
0.1,
20+
0.2,
21+
0.1,
22+
0.1,
23+
0.1,
24+
0.1,
25+
0.2,
26+
0.1,
27+
0.2,
28+
0.1
29+
],
30+
[
31+
0.1,
32+
0.2,
33+
0.1,
34+
0.5,
35+
0.1,
36+
0.2,
37+
0.1,
38+
0.1,
39+
0.1,
40+
0.1,
41+
0.2,
42+
0.1,
43+
0.2,
44+
0.1
45+
],
46+
[
47+
0.1,
48+
0.2,
49+
0.1,
50+
0.5,
51+
0.1,
52+
0.2,
53+
0.1,
54+
0.1,
55+
0.1,
56+
0.1,
57+
0.2,
58+
0.1,
59+
0.2,
60+
0.1
61+
],
62+
[
63+
0.1,
64+
0.2,
65+
0.1,
66+
0.5,
67+
0.1,
68+
0.2,
69+
0.1,
70+
0.1,
71+
0.1,
72+
0.1,
73+
0.2,
74+
0.1,
75+
0.2,
76+
0.1
77+
]
78+
]
79+
}
80+
]
81+
}

‎Resources/Textures/_Starlight/Mobs/Customization/GhostThemes/pai_fox.rsi/pai_fox.png‎

7.75 KB
Loading

0 commit comments

Comments
 (0)