Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a816880
Trigger CI rerun
GOLDMASK990 Apr 11, 2026
5e9e55f
PDA sprite filepath changed
GOLDMASK990 Apr 14, 2026
5748a76
WIP PDAs
GOLDMASK990 Apr 25, 2026
5c7238e
USSP books
Mrrpip May 15, 2026
c078b03
Aaaa
Mrrpip May 15, 2026
b1e06da
1
Mrrpip May 15, 2026
bfe6367
USSP brought back up to Faction standards, Medic and Corporal content…
GOLDMASK990 May 18, 2026
d9058f0
Update
Mrrpip May 18, 2026
77d56ae
Merge branch 'main' into USSP-Roles
GOLDMASK990 May 18, 2026
5af4f31
Typo
Mrrpip May 18, 2026
bb1fa5f
Removed spawners and amended slots as per maint comments, added a dif…
GOLDMASK990 May 23, 2026
015160a
Merge branch 'Monolith-Station:main' into USSP-Roles
GOLDMASK990 May 23, 2026
0d1910e
Merge branch 'USSP-Roles' of https://github.com/GOLDMASK990/Monolith …
GOLDMASK990 May 23, 2026
cf00705
Merge branch 'USSP-Roles' of https://github.com/GOLDMASK990/Monolith …
GOLDMASK990 May 23, 2026
313067b
Merge pull request #2 from Mrrpip/USSPbook
GOLDMASK990 May 24, 2026
920b7e8
Temp removal of USSP specific time requirements, intergration of Mrrp…
GOLDMASK990 May 24, 2026
612fd94
Commissar now recieves their meta weapon (Stamp), deslopping pass
GOLDMASK990 May 24, 2026
a54d8db
Merge branch 'main' into USSP-Roles
GOLDMASK990 May 24, 2026
9941046
Merge branch 'main' into USSP-Roles
GOLDMASK990 May 28, 2026
b8bc681
Job Icons at long last
GOLDMASK990 May 30, 2026
be4486a
Merge branch 'USSP-Roles' of https://github.com/GOLDMASK990/Monolith …
GOLDMASK990 May 30, 2026
6338eec
Merge branch 'main' into USSP-Roles
GOLDMASK990 May 30, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Content.Shared/_Mono/Shipyard/ShipAccessReaderSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public bool HasShipAccess(EntityUid user, EntityUid target, ShipAccessReaderComp
if (TryComp<CompanyComponent>(gridUid, out var shipCompany))
{
// Check if ship has one of the special company designations
if (shipCompany.CompanyName == "Rogue" || shipCompany.CompanyName == "TSF")
if (shipCompany.CompanyName == "USSP" || shipCompany.CompanyName == "Rogue" || shipCompany.CompanyName == "TSF")
{
// Check each accessible ID card for matching company
foreach (var cardUid in accessibleCards)
Expand Down
8 changes: 3 additions & 5 deletions Resources/Locale/en-US/_Mono/job/job-description.ftl
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
# MARK: USSP
job-description-ussp-commissar = Enforce the USSPs will against the TSF and PD forces of the sector, keep your subordinates orderly.
job-description-ussp-sergeant = Organize USSP Efreitors and riflemen on a tactical level.
job-description-ussp-corporal = Pilot vessels or board ships for the USSP and your commanding officers.
job-description-ussp-medic = Keep your fellow soldiers healthy and intact for the Union.
job-description-ussp-rifleman = Serve the Union in space. Follow orders from your superiors and spread socialist ideals throughout the cosmos.
job-description-ussp-commissar = Preserve discipline, hold the battalion to a common purpose, and ensure the Union’s will does not die in the Colossus Sector.
job-description-ussp-sergeant = Lead the ranks in battle, enforce standards, and hold the battalion together under pressure.
job-description-ussp-rifleman = Serve the Union far from home. Follow your superiors, stand by your comrades, and endure where others would break.

# MARK: MD
job-description-md-medic = Traverse the space to provide life-saving care aboard a medical vessel. Stabilize crew with medicine, synthesize medicine, and revive the fallen. ensure the unrecoverable deceased are respectfully secured in the morgue and cloned.
Expand Down
2 changes: 0 additions & 2 deletions Resources/Locale/en-US/_Mono/job/job-names.ftl
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# MARK: USSP
job-name-ussp-commissar = USSP Commissar
job-name-ussp-sergeant = USSP Serzhant
job-name-ussp-corporal = USSP Efreitor
job-name-ussp-medic = USSP Combat Medic
job-name-ussp-rifleman = USSP Rifleman
job-supervisors-ussp-highcomm = the Nova Cygni command.
job-supervisors-ussp-commissars = the Commissar
Expand Down
14 changes: 0 additions & 14 deletions Resources/Maps/_Mono/POI/usspbaikal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53143,20 +53143,6 @@ entities:
- type: Transform
pos: 88.5,64.5
parent: 1
- proto: SpawnPointUSSPCorporal
entities:
- uid: 7836
components:
- type: Transform
pos: 84.5,77.5
parent: 1
- proto: SpawnPointUSSPMedic
entities:
- uid: 7837
components:
- type: Transform
pos: 84.5,76.5
parent: 1
- proto: SpawnPointUSSPRifleman
entities:
- uid: 7838
Expand Down
14 changes: 0 additions & 14 deletions Resources/Maps/_Mono/Shuttles/USSP/akula.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2140,20 +2140,6 @@ entities:
- type: Transform
pos: 1.5,4.5
parent: 1
- proto: SpawnPointUSSPCorporal
entities:
- uid: 272
components:
- type: Transform
pos: 1.5,4.5
parent: 1
- proto: SpawnPointUSSPMedic
entities:
- uid: 273
components:
- type: Transform
pos: 1.5,4.5
parent: 1
- proto: SpawnPointUSSPRifleman
entities:
- uid: 274
Expand Down
9 changes: 1 addition & 8 deletions Resources/Maps/_Mono/Shuttles/USSP/drakon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3947,14 +3947,7 @@ entities:
- type: Transform
pos: 0.5,3.5
parent: 1
- proto: SpawnPointUSSPCorporal
entities:
- uid: 373
components:
- type: Transform
pos: 0.5,3.5
parent: 1
- proto: SpawnPointUSSPMedic
- proto: SpawnPointUSSPRifleman
entities:
- uid: 374
components:
Expand Down
44 changes: 0 additions & 44 deletions Resources/Maps/_Mono/Shuttles/USSP/gruznyk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2834,50 +2834,6 @@ entities:
- type: Transform
pos: -3.5,2.5
parent: 1
- proto: SpawnPointUSSPCorporal
entities:
- uid: 337
components:
- type: Transform
pos: -6.5,-4.5
parent: 1
- uid: 338
components:
- type: Transform
pos: -6.5,-5.5
parent: 1
- uid: 339
components:
- type: Transform
pos: -3.5,2.5
parent: 1
- uid: 340
components:
- type: Transform
pos: -7.5,-1.5
parent: 1
- proto: SpawnPointUSSPMedic
entities:
- uid: 341
components:
- type: Transform
pos: -3.5,2.5
parent: 1
- uid: 342
components:
- type: Transform
pos: -7.5,-1.5
parent: 1
- uid: 343
components:
- type: Transform
pos: -6.5,-4.5
parent: 1
- uid: 344
components:
- type: Transform
pos: -6.5,-5.5
parent: 1
- proto: SpawnPointUSSPRifleman
entities:
- uid: 345
Expand Down
14 changes: 0 additions & 14 deletions Resources/Maps/_Mono/Shuttles/USSP/natisk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2359,20 +2359,6 @@ entities:
- type: Transform
pos: 2.5,3.5
parent: 1
- proto: SpawnPointUSSPCorporal
entities:
- uid: 301
components:
- type: Transform
pos: 2.5,3.5
parent: 1
- proto: SpawnPointUSSPMedic
entities:
- uid: 302
components:
- type: Transform
pos: 2.5,3.5
parent: 1
- proto: SpawnPointUSSPRifleman
entities:
- uid: 303
Expand Down
34 changes: 0 additions & 34 deletions Resources/Maps/_Mono/Shuttles/USSP/remontnik.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6186,40 +6186,6 @@ entities:
- type: Transform
pos: 0.5,2.5
parent: 1
- proto: SpawnPointUSSPCorporal
entities:
- uid: 882
components:
- type: Transform
pos: 0.5,2.5
parent: 1
- uid: 883
components:
- type: Transform
pos: 3.5,10.5
parent: 1
- uid: 884
components:
- type: Transform
pos: 0.5,14.5
parent: 1
- proto: SpawnPointUSSPMedic
entities:
- uid: 885
components:
- type: Transform
pos: 0.5,2.5
parent: 1
- uid: 886
components:
- type: Transform
pos: 3.5,10.5
parent: 1
- uid: 887
components:
- type: Transform
pos: 0.5,14.5
parent: 1
- proto: SpawnPointUSSPRifleman
entities:
- uid: 888
Expand Down
14 changes: 0 additions & 14 deletions Resources/Maps/_Mono/Shuttles/USSP/sekunda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2711,20 +2711,6 @@ entities:
- type: Transform
pos: 1.5,0.5
parent: 1
- proto: SpawnPointUSSPCorporal
entities:
- uid: 388
components:
- type: Transform
pos: 1.5,0.5
parent: 1
- proto: SpawnPointUSSPMedic
entities:
- uid: 389
components:
- type: Transform
pos: -0.5,-8.5
parent: 1
- proto: SpawnPointUSSPRifleman
entities:
- uid: 390
Expand Down
14 changes: 0 additions & 14 deletions Resources/Maps/_Mono/Shuttles/USSP/strayk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1370,20 +1370,6 @@ entities:
- type: Transform
pos: 1.5,-5.5
parent: 1
- proto: SpawnPointUSSPCorporal
entities:
- uid: 242
components:
- type: Transform
pos: 1.5,-5.5
parent: 1
- proto: SpawnPointUSSPMedic
entities:
- uid: 240
components:
- type: Transform
pos: 1.5,-5.5
parent: 1
- proto: SpawnPointUSSPRifleman
entities:
- uid: 243
Expand Down
14 changes: 0 additions & 14 deletions Resources/Maps/_Mono/Shuttles/USSP/sulak.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4116,20 +4116,6 @@ entities:
- type: Transform
pos: -5.5,5.5
parent: 1
- proto: SpawnPointUSSPCorporal
entities:
- uid: 548
components:
- type: Transform
pos: -5.5,5.5
parent: 1
- proto: SpawnPointUSSPMedic
entities:
- uid: 549
components:
- type: Transform
pos: -5.5,5.5
parent: 1
- proto: SpawnPointUSSPRifleman
entities:
- uid: 550
Expand Down
14 changes: 0 additions & 14 deletions Resources/Maps/_Mono/Shuttles/USSP/tayfun.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3062,20 +3062,6 @@ entities:
- type: Transform
pos: -4.5,-6.5
parent: 1
- proto: SpawnPointUSSPCorporal
entities:
- uid: 129
components:
- type: Transform
pos: -4.5,-6.5
parent: 1
- proto: SpawnPointUSSPMedic
entities:
- uid: 586
components:
- type: Transform
pos: -4.5,-6.5
parent: 1
- proto: SpawnPointUSSPRifleman
entities:
- uid: 590
Expand Down
14 changes: 0 additions & 14 deletions Resources/Maps/_Mono/Test/dev_map.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7979,20 +7979,6 @@ entities:
- type: Transform
pos: -3.5,2.5
parent: 2
- proto: SpawnPointUSSPCorporal
entities:
- uid: 1154
components:
- type: Transform
pos: -3.5,2.5
parent: 2
- proto: SpawnPointUSSPMedic
entities:
- uid: 1155
components:
- type: Transform
pos: -3.5,2.5
parent: 2
- proto: SpawnPointUSSPRifleman
entities:
- uid: 1156
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,16 @@
- HeadSide
- type: StaticPrice
price: 500
vendPrice: 2500
vendPrice: 2500

- type: entity
parent: ClothingHeadHelmetBase
id: ClothingHeadHelmetCombatUSSP
name: USSP combat helmet
description: A mass-produced helmet used across the Armed Forces of the USSP.
components:
- type: Sprite
sprite: _Mono/Clothing/Head/Helmets/ussp_combat_helmet.rsi
- type: Clothing
sprite: _Mono/Clothing/Head/Helmets/ussp_combat_helmet.rsi

Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
parent: ClothingUniformBase
id: ClothingUniformUSSP
name: USSP uniform
description: Standard fatigues of the USSP military.
description: Standard fatigues of the USSP Armed Forces.
components:
- type: Sprite
sprite: _Mono/Clothing/Uniforms/Jumpsuit/ussp.rsi
Expand All @@ -123,6 +123,20 @@
randomMode: false
mode: SensorVitals

- type: entity
parent: ClothingUniformBase
id: ClothingUniformServiceDressUSSP
name: USSP Service Dress
description: More formal attire for servicemen, styled after the uniforms worn during the struggle against the early TSF.
components:
- type: Sprite
sprite: _Mono/Clothing/Uniforms/Jumpsuit/ussp_service_dress.rsi
- type: Clothing
sprite: _Mono/Clothing/Uniforms/Jumpsuit/ussp_service_dress.rsi
- type: SuitSensor
randomMode: false
mode: SensorVitals

- type: entity
parent: ClothingUniformBase
id: ClothingUniformRogue
Expand Down
22 changes: 0 additions & 22 deletions Resources/Prototypes/_Mono/Entities/Markers/Spawners/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,28 +50,6 @@
sprite: Structures/Decoration/banner.rsi
state: banner-red

- type: entity
id: SpawnPointUSSPMedic
parent: SpawnPointJobBase
name: USSP Combat Medic
components:
- type: SpawnPoint
job_id: USSPMedic
- type: Sprite
sprite: Structures/Decoration/banner.rsi
state: banner-red

- type: entity
id: SpawnPointUSSPCorporal
parent: SpawnPointJobBase
name: USSP Efreitor
components:
- type: SpawnPoint
job_id: USSPCorporal
- type: Sprite
sprite: Structures/Decoration/banner.rsi
state: banner-red

- type: entity
id: SpawnPointUSSPSergeant
parent: SpawnPointJobBase
Expand Down
Loading
Loading