Skip to content

Commit 02793e0

Browse files
committed
Merge branch 'starlight-dev' of https://github.com/ss14Starlight/space-station-14 into starlight-dev
2 parents ac26343 + b45db5e commit 02793e0

75 files changed

Lines changed: 1561 additions & 664 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Content.Shared/Atmos/Atmospherics.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ public static class Atmospherics
320320
/// (The pressure threshold is so low that it doesn't make sense to do any calculations,
321321
/// so it just applies this flat value).
322322
/// </summary>
323-
public const int LowPressureDamage = 4;
323+
public const int LowPressureDamage = 1; //Starlight. nerf back to old values pending changes back to 4 or lower.
324324

325325
public const float WindowHeatTransferCoefficient = 0.1f;
326326

Content.Shared/Silicons/Laws/SiliconLawPrototype.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ public SiliconLaw ShallowClone()
7272
{
7373
LawString = LawString,
7474
Order = Order,
75-
LawIdentifierOverride = LawIdentifierOverride
75+
LawIdentifierOverride = LawIdentifierOverride,
76+
Sayable = Sayable //starlight
7677
};
7778
}
7879
}

Resources/Changelog/ChangelogStarlight.yml

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10752,5 +10752,98 @@ Entries:
1075210752
id: 1475
1075310753
time: '2025-08-07T21:09:27.000000+00:00'
1075410754
url: https://github.com/ss14Starlight/space-station-14/pull/1070
10755+
- author: CommanderAlex365
10756+
changes:
10757+
- message: Alphabetized species order in guidebook
10758+
type: Tweak
10759+
id: 1480
10760+
time: '2025-08-07T22:24:13.000000+00:00'
10761+
url: https://github.com/ss14Starlight/space-station-14/pull/1252
10762+
- author: Quini98
10763+
changes:
10764+
- message: Service SOP
10765+
type: Add
10766+
id: 1481
10767+
time: '2025-08-07T22:32:24.000000+00:00'
10768+
url: https://github.com/ss14Starlight/space-station-14/pull/1147
10769+
- author: Quini98
10770+
changes:
10771+
- message: Command SOP
10772+
type: Tweak
10773+
id: 1482
10774+
time: '2025-08-07T22:32:24.000000+00:00'
10775+
url: https://github.com/ss14Starlight/space-station-14/pull/1147
10776+
- author: Quini98
10777+
changes:
10778+
- message: Cargo SOP
10779+
type: Tweak
10780+
id: 1483
10781+
time: '2025-08-07T22:32:24.000000+00:00'
10782+
url: https://github.com/ss14Starlight/space-station-14/pull/1147
10783+
- author: Quini98
10784+
changes:
10785+
- message: Security SOP
10786+
type: Tweak
10787+
id: 1484
10788+
time: '2025-08-07T22:32:24.000000+00:00'
10789+
url: https://github.com/ss14Starlight/space-station-14/pull/1147
10790+
- author: Quini98
10791+
changes:
10792+
- message: NT SOP
10793+
type: Tweak
10794+
id: 1485
10795+
time: '2025-08-07T22:32:24.000000+00:00'
10796+
url: https://github.com/ss14Starlight/space-station-14/pull/1147
10797+
- author: Quini98
10798+
changes:
10799+
- message: Engineering SOP
10800+
type: Tweak
10801+
id: 1486
10802+
time: '2025-08-07T22:32:24.000000+00:00'
10803+
url: https://github.com/ss14Starlight/space-station-14/pull/1147
10804+
- author: Quini98
10805+
changes:
10806+
- message: Science SOP
10807+
type: Fix
10808+
id: 1487
10809+
time: '2025-08-07T22:32:24.000000+00:00'
10810+
url: https://github.com/ss14Starlight/space-station-14/pull/1147
10811+
- author: Quini98
10812+
changes:
10813+
- message: General SOP
10814+
type: Tweak
10815+
id: 1488
10816+
time: '2025-08-07T22:32:24.000000+00:00'
10817+
url: https://github.com/ss14Starlight/space-station-14/pull/1147
10818+
- author: Quini98
10819+
changes:
10820+
- message: Sub-Categories
10821+
type: Add
10822+
id: 1489
10823+
time: '2025-08-07T22:32:24.000000+00:00'
10824+
url: https://github.com/ss14Starlight/space-station-14/pull/1147
10825+
- author: Quini98
10826+
changes:
10827+
- message: Medical SOP
10828+
type: Add
10829+
id: 1490
10830+
time: '2025-08-07T22:32:24.000000+00:00'
10831+
url: https://github.com/ss14Starlight/space-station-14/pull/1147
10832+
- author: walksanatora
10833+
changes:
10834+
- message: Spacing cut into a quarter of what it once was. reverting wizden spacing
10835+
dammage buff.
10836+
type: Tweak
10837+
id: 1491
10838+
time: '2025-08-07T22:35:00.000000+00:00'
10839+
url: https://github.com/ss14Starlight/space-station-14/pull/1254
10840+
- author: RoadTrain
10841+
changes:
10842+
- message: Fixes the Sayable component, which resulted in law 0 being sayable until
10843+
emagged.
10844+
type: Fix
10845+
id: 1492
10846+
time: '2025-08-07T22:37:49.000000+00:00'
10847+
url: https://github.com/ss14Starlight/space-station-14/pull/1251
1075510848
Order: -1
1075610849

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

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ guide-entry-sl-non-crew-policies = Non-crew Policies
5757
guide-entry-sl-docking-and-visitors = Docking and Visitors
5858
guide-entry-sl-vessels = Vessels
5959
60-
guide-entry-sl-nanotrasen-staff-handling-policies = Nontrasen Staff Handling Policies
60+
guide-entry-sl-nanotrasen-staff-handling-policies = NanoTrasen Staff Handling Policies
6161
guide-entry-sl-hiring-transfer-policies = Hiring / Transfer
6262
guide-entry-sl-firing-demotion-policies = Firing / Demotion
6363
guide-entry-sl-cause-for-demotion = Causes for Demotion and Dismissal
64-
guide-entry-sl-vote-of-no-confidence = Vote of No Confidence
64+
guide-entry-sl-vote-of-no-confidence = Vote Of No Confidence
6565
guide-entry-sl-money-accounts-and-space-credits = Money Accounts and Space Credits
6666
6767
guide-entry-sl-security-sop-intro = Security
@@ -76,21 +76,44 @@ guide-entry-sl-security-sop-prisonertreatment = Prisoner Treatment
7676
guide-entry-sl-legal-sop-intro = Legal
7777
7878
guide-entry-sl-engineering-sop-intro = Engineering
79+
guide-entry-sl-engineering-sop-genproc-intro = General Procedures
7980
guide-entry-sl-engineering-sop-power-generation = Power Generation
8081
guide-entry-sl-engineering-sop-station-damage = Station Damage
82+
guide-entry-sl-engineering-sop-staff-intro = Staff Procedures
8183
guide-entry-sl-engineering-sop-chief-engineer = Chief Engineer
8284
guide-entry-sl-engineering-sop-station-engineer = Station Engineer
8385
guide-entry-sl-engineering-sop-atmos-tech = Atmospheric Technician
8486
guide-entry-sl-engineering-sop-technical-assistant = Technical Assistant
8587
8688
guide-entry-sl-medical-sop-intro = Medical
89+
guide-entry-sl-medical-sop-genproc-intro = General Procedures
90+
guide-entry-sl-medical-sop-contrabandchemicals = Contraband Chemicals
91+
guide-entry-sl-medical-sop-chemsminorcontraband = Minor Contraband
92+
guide-entry-sl-medical-sop-chemsmajorcontraband = Major Contraband
93+
guide-entry-sl-medical-sop-chemssyndicatecontraband = Syndicate Contraband
94+
guide-entry-sl-medical-sop-medicalbay = Medical Bay
95+
guide-entry-sl-medical-sop-patientcare = Patient Care
96+
guide-entry-sl-medical-sop-deceasedpatientcare = Deceased Patient Care
97+
guide-entry-sl-medical-sop-violetalertprotocol = Violet Alert Protocol
98+
guide-entry-sl-medical-sop-staff-intro = Staff Procedures
99+
guide-entry-sl-medical-sop-chiefmedicalofficer = Chief Medical Officer
100+
guide-entry-sl-medical-sop-surgeon = Surgeon
101+
guide-entry-sl-medical-sop-medicaldoctor = Medical Doctor
102+
guide-entry-sl-medical-sop-medicalintern = Medical Intern
103+
guide-entry-sl-medical-sop-paramedic = Paramedic
104+
guide-entry-sl-medical-sop-psychologist = Psychologist
105+
guide-entry-sl-medical-sop-chemist = Chemist
87106
88107
guide-entry-sl-cargo-sop-intro = Cargo
108+
guide-entry-sl-cargo-sop-genproc-intro = General Procedures
89109
guide-entry-sl-cargo-sop-cargotechnician = Cargo Technician
110+
guide-entry-sl-cargo-sop-mailtechnician = Mail Technician
90111
guide-entry-sl-cargo-sop-miningspecialist = Mining Specialist
91112
guide-entry-sl-cargo-sop-salvagespecialist = SalvageSpecialist
92-
guide-entry-sl-cargo-sop-quartermaster = Quartermaster (QM)
113+
guide-entry-sl-cargo-sop-quartermaster = Quartermaster
114+
guide-entry-sl-cargo-sop-staff-intro = Staff Procedures
93115
guide-entry-sl-cargo-sop-handlingorders = Handling Orders
116+
guide-entry-sl-cargo-sop-preapprovedmaterials = Pre-Approved Materials
94117
guide-entry-sl-cargo-sop-handlingorders-engineering = Engineering Orders
95118
guide-entry-sl-cargo-sop-handlingorders-security = Security Orders
96119
guide-entry-sl-cargo-sop-handlingorders-science = Science Orders
@@ -100,9 +123,15 @@ guide-entry-sl-cargo-sop-handlingorders-service = Service Orders
100123
guide-entry-sl-science-sop-intro = Science
101124
102125
guide-entry-sl-nano-trasen-employee-sop-intro = NanoTrasen Employee
126+
guide-entry-sl-nano-trasen-employee-sop-genproc-intro = General Procedures
103127
guide-entry-sl-nano-trasen-employee-sop-safety-protocol = Safety Protocol
128+
guide-entry-sl-nano-trasen-employee-sop-staff-intro = Staff Procedures
104129
guide-entry-sl-nano-trasen-employee-sop-nt-rep = NanoTrasen Representative
105130
guide-entry-sl-nano-trasen-employee-sop-bso = BlueShield Officer
106131
guide-entry-sl-nano-trasen-employee-sop-magistrate = Magistrate
107132
guide-entry-sl-nano-trasen-employee-sop-iaa = Internal Affairs Agent
108133
134+
guide-entry-sl-service-sop-intro = Service
135+
guide-entry-sl-service-sop-genproc-intro = General Procedures
136+
guide-entry-sl-service-sop-staff-intro = Staff Procedures
137+
guide-entry-sl-service-sop-headofpersonnel = Head of Personnel

Resources/Prototypes/Guidebook/species.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,20 @@
44
text: "/ServerInfo/Guidebook/Mobs/Species.xml"
55
children:
66
- Arachnid
7+
- Avali
8+
- Cyclorite
79
- Diona
810
- Dwarf
11+
- Felionoid
912
- Human
13+
- SlimePerson
1014
- Moth
1115
- Reptilian
12-
- SlimePerson
13-
- Vox
14-
- Felionoid
15-
- Cyclorite
16-
- Vulpkanin
1716
- Resomi
18-
- Avali
1917
- Shadekin
18+
- Vox
19+
- Vulpkanin
20+
2021

2122
- type: guideEntry
2223
id: Arachnid

0 commit comments

Comments
 (0)