Skip to content

Commit 53d1124

Browse files
Merge branch 'starlight-dev' into upstream/solutions-rebirth
2 parents 3c83a2c + be73057 commit 53d1124

10 files changed

Lines changed: 66 additions & 29 deletions

File tree

Resources/Changelog/ChangelogStarlight.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +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
232
- author: Rhapsody (Pepta Vismahl)
243
changes:
254
- message: Removed Scientist playtime requirement from S.E.L.F Agent.
@@ -2799,4 +2778,25 @@ Entries:
27992778
id: 408043
28002779
time: '2026-09-02T02:14:14.000000+00:00'
28012780
url: https://github.com/ss14Starlight/space-station-14/pull/5931
2781+
- author: Conflee
2782+
changes:
2783+
- 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).
2784+
type: Add
2785+
id: 408044
2786+
time: '2026-09-02T05:00:03.000000+00:00'
2787+
url: https://github.com/ss14Starlight/space-station-14/pull/5778
2788+
- author: Conflee
2789+
changes:
2790+
- 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.
2791+
type: Tweak
2792+
id: 408045
2793+
time: '2026-09-02T05:00:03.000000+00:00'
2794+
url: https://github.com/ss14Starlight/space-station-14/pull/5778
2795+
- author: Conflee
2796+
changes:
2797+
- message: Added Starlight jobs to the Jobs and Security pages in the Guidebook.
2798+
type: Tweak
2799+
id: 408046
2800+
time: '2026-09-02T05:00:03.000000+00:00'
2801+
url: https://github.com/ss14Starlight/space-station-14/pull/5778
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

Resources/Prototypes/Guidebook/security.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
- Forensics
77
- Defusal
88
- CriminalRecords
9+
- StirStir #SL Edit
910

1011
- type: guideEntry
1112
id: Forensics

Resources/Prototypes/_Starlight/Entities/Mobs/NPCs/pets.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@
124124
attributes:
125125
proper: true
126126
gender: male
127+
- type: GuideHelp
128+
guides:
129+
- StirStir
127130

128131
## ADMIN MICE
129132

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
- type: guideEntry
2+
id: StirStir
3+
name: guide-entry-stirstir
4+
text: "/ServerInfo/_Starlight/Guidebook/Mobs/StirStir.xml"

Resources/Prototypes/_Starlight/Roles/Jobs/Fun/prisoner.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
description: job-description-stirstir
1717
playTimeTracker: JobStirStir
1818
requirements:
19-
- !type:DepartmentTimeRequirement
20-
department: Security
21-
time: 0.25h
19+
- !type:RoleTimeRequirement
20+
role: JobSecurityOfficer
21+
time: 7200 # 2 hrs
2222
startingGear: PrisonerGear
2323
setPreference: false
2424
icon: "JobIconPrisoner"

Resources/ServerInfo/Guidebook/Jobs.xml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ SS14 has a large number of jobs, divided into seven major departments:
99
It primarily functions as folks who entertain, clean, and serve the rest of the crew, with the exception of assistants who have no particular job beyond getting lost in maintenance.
1010

1111
## Cargo
12-
[color=#b18644]Cargo[/color] consists of the cargo technicians, salvage specialists, and the quartermaster. As a department, it responsible resource distribution and trade, capable of buying and selling things on the galactic market.
12+
[color=#b18644]Cargo[/color] consists of the cargo technicians, mail technicians, salvage specialists, mining specialists, and the quartermaster. As a department, it responsible resource distribution and trade, capable of buying and selling things on the galactic market.
1313

1414
For the most part, this means they scrounge around the station and assorted wrecks to find materials to sell and redistribute, and purchase materials other departments request.
1515

@@ -29,14 +29,19 @@ Scientists should seek out new artifacts to study, as well as solicit department
2929
Engineering is readily equipped to go safely into space, and as such they should always attempt to repair uninhabitable parts of the station.
3030

3131
## Security
32-
[color=#cb0000]Security[/color] consists of the security cadets, lawyers, detective, security officers, warden, and the head of security. As a department it is responsible for dealing with troublemakers and non-humanoid threats like giant rats and carp.
32+
[color=#cb0000]Security[/color] consists of the security cadets, security officers, brig medics, duty officers, detective, warden, and the head of security. As a department it is responsible for dealing with troublemakers and non-humanoid threats like giant rats and carp.
3333

3434
As a result of this, and the need to walk a fine line, security sometimes is overwhelmed by angry crew (don't kill the clown), and it is important for its members to try and stay on their best behavior.
3535

3636
## Command
3737
[color=#1b67a5]Command[/color] consists of every department head. It is responsible for keeping the station and its departments running efficiently.
3838

39-
Command members should always be relatively competent in their respective departments and attempt to delegate responsibility and direct work.
39+
Command members should always be relatively competent in their respective departments and attempt to delegate responsibility and direct work. You report directly to Central Command.
40+
41+
## NanoTrasen
42+
[color=#478eff]NanoTrasen[/color] consists of the nanotrasen representative, magistrate, internal affairs agents, nanotrasen career trainers, and station ai. It is responsible for maintaining oversight and offering guidance to Command.
43+
44+
While NanoTrasen owns the research stations the crew works on, they have been pulled away on more important business for over 50 years, leaving the manning and daily operations to a contractor known as Central Command. The job of NanoTrasen personnel on stations is to ensure they actually do their jobs, properly, and do not attempt to seize control for themselves.
4045

4146
# Getting Your Job Changed
4247
The [color=#9fed58]Head of Personnel[/color] is the person in charge of changing ID accesses and handing out encryption keys. Head over to their office and let them know what job you'd like to work instead.

Resources/ServerInfo/Guidebook/Security/Security.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Ensuring the safety of both station and crew is number one for [color=#cb0000]Se
55
They face [textlink="Syndicate Agents" link="Traitors"], [textlink="Nuclear Operatives" link="NuclearOperatives"], [textlink="Zombies" link="Zombies"] and unruly staff.
66

77
## Personnel
8-
[color=#cb0000]Security[/color]'s staff is made up of Security Cadets, Security Officers, and the Detective. [color=#cb0000]Security[/color] is run by the Warden and Head of Security.
8+
[color=#cb0000]Security[/color]'s staff is made up of Security Cadets, Security Officers, Brig Medics, Duty Officers, and the Detective. [color=#cb0000]Security[/color] is run by the Warden and Head of Security.
99

1010
<Box>
1111
<GuideEntityEmbed Entity="ToyFigurineSecurity" Caption="Secoff"/>
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<Document>
2+
# Stir Stir
3+
4+
<Box>
5+
<GuideEntityEmbed Entity="PosterContrabandWantedStirStir" Caption=""/>
6+
</Box>
7+
8+
## Who is Stir Stir?
9+
Stir Stir is the more troublesome cousin of the slightly less disreputable Bar Monkey, [color=yellow]Pun Pun[/color]. Often called a cell stuffer, due to how frequently he finds himself behind bars. Despite everything, the charges never seem to stick for long.
10+
11+
Stir Stir can almost always be found locked up in [color=yellow]Genpop[/color] in [color=red]Security[/color] at the start of every shift.
12+
13+
## Roleplaying As and With Stir Stir
14+
Stir Stir might be behind bars, but he is [color=red]not an Antagonist[/color]. Leeway may be given by Staff for breakout attempts, but murder and constant griefing is not allowed. You require [color=yellow] 2 hours of Security Officer play time[/color] to play as Stir Stir for a reason, so you know how annoying it would be if you acted poorly.
15+
16+
The circumstances of Stir Stir's incarceration are intentionally ambiguous, and are left up to the Roleplayers to decide every round. Depending on what is decided as Stir Stir's crime, [color=red]Security[/color] can decide to allow [color=yellow]parole[/color] by involving the [color=yellow]Magistrate or Lawyers[/color] in the process for procedure and Roleplay.
17+
18+
## Antagonists and Stir Stir
19+
Stir Stir is designed as a Roleplay-first role for players, but like all Smart Monkeys and Kobolds, you can roll [color=red]Antagonist Roles[/color] as him. Your objectives will be difficult as you start behind bars.
20+
21+
His imprisonment may also be to his benefit. Stir Stir has a spotty past and there are plenty of reasons for the [color=red]Syndicate[/color] to want him, dead or alive. Perhaps breaking out isn't always the best idea.
22+
23+
</Document>

0 commit comments

Comments
 (0)