Skip to content

Commit 117599a

Browse files
Merge branch 'starlight-dev' of github.com:ss14Starlight/space-station-14 into antags/don't-become-a-midround-nukie
2 parents 6831c4f + e6a1e85 commit 117599a

12 files changed

Lines changed: 31881 additions & 31827 deletions

File tree

Resources/Changelog/ChangelogStarlight.yml

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,4 @@
11
Entries:
2-
- author: Forrestgod
3-
changes:
4-
- message: '[Serpentcrest] Added Waste/Distro Pipes to Arrival Docks.'
5-
type: Add
6-
id: 407644
7-
time: '2026-08-16T15:22:38.000000+00:00'
8-
url: https://github.com/ss14Starlight/space-station-14/pull/5668
9-
- author: Forrestgod
10-
changes:
11-
- message: '[Serpentcrest] Added Waste/Distro Pipes to Docking Arm.'
12-
type: Add
13-
id: 407645
14-
time: '2026-08-16T15:22:38.000000+00:00'
15-
url: https://github.com/ss14Starlight/space-station-14/pull/5668
16-
- author: Forrestgod
17-
changes:
18-
- message: '[Serpentcrest] Small waste system for Top East maintance Tunnels.'
19-
type: Add
20-
id: 407646
21-
time: '2026-08-16T15:22:38.000000+00:00'
22-
url: https://github.com/ss14Starlight/space-station-14/pull/5668
23-
- author: Rhapsody (Pepta Vismahl)
24-
changes:
25-
- message: Removed Scientist playtime requirement from S.E.L.F Agent.
26-
type: Remove
27-
id: 407647
28-
time: '2026-08-16T15:22:41.000000+00:00'
29-
url: https://github.com/ss14Starlight/space-station-14/pull/5651
30-
- author: SirLutz
31-
changes:
32-
- message: Turnstile HP reduced from 500-> 150.
33-
type: Tweak
34-
id: 407648
35-
time: '2026-08-16T15:53:53.000000+00:00'
36-
url: https://github.com/ss14Starlight/space-station-14/pull/5672
37-
- author: SirLutz
38-
changes:
39-
- message: Airlocks HP reduced from 500 -> 300.
40-
type: Tweak
41-
id: 407649
42-
time: '2026-08-16T15:53:53.000000+00:00'
43-
url: https://github.com/ss14Starlight/space-station-14/pull/5672
44-
- author: SirLutz
45-
changes:
46-
- message: Firelocks HP reduced from 500 -> 250.
47-
type: Tweak
48-
id: 407650
49-
time: '2026-08-16T15:53:53.000000+00:00'
50-
url: https://github.com/ss14Starlight/space-station-14/pull/5672
512
- author: SirLutz
523
changes:
534
- message: Reinf. Windoors HP reduced from 400 -> 300.
@@ -2799,4 +2750,53 @@ Entries:
27992750
id: 408043
28002751
time: '2026-09-02T02:14:14.000000+00:00'
28012752
url: https://github.com/ss14Starlight/space-station-14/pull/5931
2753+
- author: Conflee
2754+
changes:
2755+
- message: Added a Guidebook entry for Stir Stir adding more information on how to play as Stir Stir, interact with him as Security, and basic information to help RP as/with him. Their crime is vague on purpose, so RPers can decide in round. He can be paroled for good behavior, try to involve Lawyers and Magi, and he is NOT an Antag (unless he rolls an antag role).
2756+
type: Add
2757+
id: 408044
2758+
time: '2026-09-02T05:00:03.000000+00:00'
2759+
url: https://github.com/ss14Starlight/space-station-14/pull/5778
2760+
- author: Conflee
2761+
changes:
2762+
- message: Changed Stir Stir's playtime requirement from 15 minutes of Security Department to 2 hours of Security Officer. Maybe people will hesitate to be a shitter as Stir Stir if they've been on the receiving end as a Secoff before.
2763+
type: Tweak
2764+
id: 408045
2765+
time: '2026-09-02T05:00:03.000000+00:00'
2766+
url: https://github.com/ss14Starlight/space-station-14/pull/5778
2767+
- author: Conflee
2768+
changes:
2769+
- message: Added Starlight jobs to the Jobs and Security pages in the Guidebook.
2770+
type: Tweak
2771+
id: 408046
2772+
time: '2026-09-02T05:00:03.000000+00:00'
2773+
url: https://github.com/ss14Starlight/space-station-14/pull/5778
2774+
- author: Forrestgod
2775+
changes:
2776+
- message: '[Serpentcrest] Added 2 K9 Spawn Slots in Security.'
2777+
type: Add
2778+
id: 408047
2779+
time: '2026-09-02T09:10:57.000000+00:00'
2780+
url: https://github.com/ss14Starlight/space-station-14/pull/5883
2781+
- author: Forrestgod
2782+
changes:
2783+
- message: '[Serpentcrest] Added a water cooler in Security.'
2784+
type: Add
2785+
id: 408048
2786+
time: '2026-09-02T09:10:57.000000+00:00'
2787+
url: https://github.com/ss14Starlight/space-station-14/pull/5883
2788+
- author: Forrestgod
2789+
changes:
2790+
- message: '[Serpentcrest] Added a Pet Carrier in Security.'
2791+
type: Add
2792+
id: 408049
2793+
time: '2026-09-02T09:10:57.000000+00:00'
2794+
url: https://github.com/ss14Starlight/space-station-14/pull/5883
2795+
- author: Forrestgod
2796+
changes:
2797+
- message: '[Serpentcrest] Sec front is now brig access, cadets allowed in now.'
2798+
type: Fix
2799+
id: 408050
2800+
time: '2026-09-02T09:10:57.000000+00:00'
2801+
url: https://github.com/ss14Starlight/space-station-14/pull/5883
28022802
Order: -1

Resources/Locale/en-US/_Starlight/ghost/roles/ghost-role-component.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ ghost-role-information-kiki-name = Kiki
129129
ghost-role-information-kiki-description = An honorable member of the kobold society in charge of botany and helping the botanists in any way she can.
130130
131131
ghost-role-information-stirstir-name = Stir Stir
132-
ghost-role-information-stirstir-description = A disreputable monkey who should not be trusted. A real cell stuffer.
132+
ghost-role-information-stirstir-description = A disreputable monkey who should not be trusted. A real cell stuffer. Check the Guidebook for more information.
133133
134134
ghost-role-information-syndicate-mothroach-reinforcement-name = Syndicate Mobroach
135135
ghost-role-information-syndicate-mothroach-reinforcement-description = Someone needs reinforcements. You, a trained mobroach, will help them.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ guide-entry-sl-security-sop-hostage-situations = Hostage Situations
9393
guide-entry-sl-security-sop-criminal-status = Criminal Status
9494
9595
guide-entry-rules-supernatural-entities = Supernatural Entities
96+
guide-entry-stirstir = Stir Stir
9697
9798
guide-entry-sl-legal-sop-intro = Legal
9899

0 commit comments

Comments
 (0)