diff --git a/Content.Shared/_Mono/Shipyard/ShipAccessReaderSystem.cs b/Content.Shared/_Mono/Shipyard/ShipAccessReaderSystem.cs index aadb117c863..0135d3576b3 100644 --- a/Content.Shared/_Mono/Shipyard/ShipAccessReaderSystem.cs +++ b/Content.Shared/_Mono/Shipyard/ShipAccessReaderSystem.cs @@ -126,7 +126,7 @@ public bool HasShipAccess(EntityUid user, EntityUid target, ShipAccessReaderComp if (TryComp(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) diff --git a/Resources/Locale/en-US/_Mono/job/job-description.ftl b/Resources/Locale/en-US/_Mono/job/job-description.ftl index 961390c00d7..99e2a292e63 100644 --- a/Resources/Locale/en-US/_Mono/job/job-description.ftl +++ b/Resources/Locale/en-US/_Mono/job/job-description.ftl @@ -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. diff --git a/Resources/Locale/en-US/_Mono/job/job-names.ftl b/Resources/Locale/en-US/_Mono/job/job-names.ftl index a25e7bc1c1f..92b9ef12b84 100644 --- a/Resources/Locale/en-US/_Mono/job/job-names.ftl +++ b/Resources/Locale/en-US/_Mono/job/job-names.ftl @@ -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 diff --git a/Resources/Maps/_Mono/POI/usspbaikal.yml b/Resources/Maps/_Mono/POI/usspbaikal.yml index 85a18f645ba..9b4dfba97c1 100644 --- a/Resources/Maps/_Mono/POI/usspbaikal.yml +++ b/Resources/Maps/_Mono/POI/usspbaikal.yml @@ -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 diff --git a/Resources/Maps/_Mono/Shuttles/USSP/akula.yml b/Resources/Maps/_Mono/Shuttles/USSP/akula.yml index f94b7b81116..ce4038174cb 100644 --- a/Resources/Maps/_Mono/Shuttles/USSP/akula.yml +++ b/Resources/Maps/_Mono/Shuttles/USSP/akula.yml @@ -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 diff --git a/Resources/Maps/_Mono/Shuttles/USSP/drakon.yml b/Resources/Maps/_Mono/Shuttles/USSP/drakon.yml index 58325ee57cf..68fbb0e8b88 100644 --- a/Resources/Maps/_Mono/Shuttles/USSP/drakon.yml +++ b/Resources/Maps/_Mono/Shuttles/USSP/drakon.yml @@ -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: diff --git a/Resources/Maps/_Mono/Shuttles/USSP/gruznyk.yml b/Resources/Maps/_Mono/Shuttles/USSP/gruznyk.yml index b1f2da46828..60b41937b06 100644 --- a/Resources/Maps/_Mono/Shuttles/USSP/gruznyk.yml +++ b/Resources/Maps/_Mono/Shuttles/USSP/gruznyk.yml @@ -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 diff --git a/Resources/Maps/_Mono/Shuttles/USSP/natisk.yml b/Resources/Maps/_Mono/Shuttles/USSP/natisk.yml index bd56e3f2520..46debc2bf91 100644 --- a/Resources/Maps/_Mono/Shuttles/USSP/natisk.yml +++ b/Resources/Maps/_Mono/Shuttles/USSP/natisk.yml @@ -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 diff --git a/Resources/Maps/_Mono/Shuttles/USSP/remontnik.yml b/Resources/Maps/_Mono/Shuttles/USSP/remontnik.yml index fb268167a7c..5c2cfc5238b 100644 --- a/Resources/Maps/_Mono/Shuttles/USSP/remontnik.yml +++ b/Resources/Maps/_Mono/Shuttles/USSP/remontnik.yml @@ -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 diff --git a/Resources/Maps/_Mono/Shuttles/USSP/sekunda.yml b/Resources/Maps/_Mono/Shuttles/USSP/sekunda.yml index 61dce69622c..00c861b3c7a 100644 --- a/Resources/Maps/_Mono/Shuttles/USSP/sekunda.yml +++ b/Resources/Maps/_Mono/Shuttles/USSP/sekunda.yml @@ -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 diff --git a/Resources/Maps/_Mono/Shuttles/USSP/strayk.yml b/Resources/Maps/_Mono/Shuttles/USSP/strayk.yml index bb36593338a..3d074d36e50 100644 --- a/Resources/Maps/_Mono/Shuttles/USSP/strayk.yml +++ b/Resources/Maps/_Mono/Shuttles/USSP/strayk.yml @@ -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 diff --git a/Resources/Maps/_Mono/Shuttles/USSP/sulak.yml b/Resources/Maps/_Mono/Shuttles/USSP/sulak.yml index a4e0457b69e..5d4dacb66d1 100644 --- a/Resources/Maps/_Mono/Shuttles/USSP/sulak.yml +++ b/Resources/Maps/_Mono/Shuttles/USSP/sulak.yml @@ -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 diff --git a/Resources/Maps/_Mono/Shuttles/USSP/tayfun.yml b/Resources/Maps/_Mono/Shuttles/USSP/tayfun.yml index bc4587339e3..52444dd826a 100644 --- a/Resources/Maps/_Mono/Shuttles/USSP/tayfun.yml +++ b/Resources/Maps/_Mono/Shuttles/USSP/tayfun.yml @@ -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 diff --git a/Resources/Maps/_Mono/Test/dev_map.yml b/Resources/Maps/_Mono/Test/dev_map.yml index 26839b3f3f8..351d23cd4ba 100644 --- a/Resources/Maps/_Mono/Test/dev_map.yml +++ b/Resources/Maps/_Mono/Test/dev_map.yml @@ -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 diff --git a/Resources/Prototypes/_Mono/Entities/Clothing/Head/Helmets/ussp.yml b/Resources/Prototypes/_Mono/Entities/Clothing/Head/Helmets/ussp.yml index 1d919716f06..f78a82b936c 100644 --- a/Resources/Prototypes/_Mono/Entities/Clothing/Head/Helmets/ussp.yml +++ b/Resources/Prototypes/_Mono/Entities/Clothing/Head/Helmets/ussp.yml @@ -25,4 +25,16 @@ - HeadSide - type: StaticPrice price: 500 - vendPrice: 2500 \ No newline at end of file + 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 + diff --git a/Resources/Prototypes/_Mono/Entities/Clothing/Jumpsuit/jumpsuits.yml b/Resources/Prototypes/_Mono/Entities/Clothing/Jumpsuit/jumpsuits.yml index 69e2222e78a..e46ea744869 100644 --- a/Resources/Prototypes/_Mono/Entities/Clothing/Jumpsuit/jumpsuits.yml +++ b/Resources/Prototypes/_Mono/Entities/Clothing/Jumpsuit/jumpsuits.yml @@ -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 @@ -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 diff --git a/Resources/Prototypes/_Mono/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_Mono/Entities/Markers/Spawners/jobs.yml index 9f6f13ce1bc..bc0ae4287e2 100644 --- a/Resources/Prototypes/_Mono/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_Mono/Entities/Markers/Spawners/jobs.yml @@ -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 diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Devices/Misc/identification_cards.yml b/Resources/Prototypes/_Mono/Entities/Objects/Devices/Misc/identification_cards.yml index b3947e53e68..818e0d8061f 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Devices/Misc/identification_cards.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Devices/Misc/identification_cards.yml @@ -16,32 +16,6 @@ - type: Item heldPrefix: default -- type: entity - parent: CadetIDCard - id: USSPCorporalIDCard - name: USSP efreitor ID card - components: - - type: PresetIdCard - job: USSPCorporal - - type: Sprite - sprite: Objects/Misc/id_cards.rsi - layers: - - state: default - - state: idsecurityofficer - -- type: entity - parent: IDCardStandard - id: USSPMedicIDCard - name: USSP combat medic ID card - components: - - type: PresetIdCard - job: USSPMedic - - type: Sprite - sprite: Objects/Misc/id_cards.rsi - layers: - - state: default - - state: idbrigmedic - - type: entity parent: IDCardStandard id: USSPSergeantIDCard diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Devices/door_access.yml b/Resources/Prototypes/_Mono/Entities/Objects/Devices/door_access.yml index 215a27301f5..c3b58474677 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Devices/door_access.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Devices/door_access.yml @@ -4,7 +4,7 @@ suffix: USSP, Locked components: - type: AccessReader - access: [["Mercenary"]] + access: [["USSP"]] - type: entity parent: DoorElectronics @@ -12,7 +12,7 @@ suffix: USSP Secure, Locked components: - type: AccessReader - access: [["Mercenary"]] + access: [["USSPHigh"]] - type: entity parent: DoorElectronics @@ -20,7 +20,7 @@ suffix: USSP Command, Locked components: - type: AccessReader - access: [["Mercenary"]] + access: [["USSPCommand"]] - type: entity parent: DoorElectronics diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_Mono/Entities/Objects/Devices/pda.yml index 387d94b630b..c7fc6928ab2 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Devices/pda.yml @@ -4,6 +4,13 @@ description: A basic personal computer for access restriction and organization, manufactured in the USSP. abstract: true components: + - type: Pda + bookSlot: + startingItem: BookUSSPLaw + priority: -2 + whitelist: + tags: + - BookUSSPLaw - type: CartridgeLoader preinstalled: - CrewManifestCartridge @@ -12,38 +19,7 @@ - BountyContractsCartridge - AstroNavCartridge - type: Sprite - sprite: Objects/Devices/pda.rsi - layers: - - map: [ "enum.PdaVisualLayers.Base" ] - state: "pda" - - state: "light_overlay" - map: [ "enum.PdaVisualLayers.Flashlight" ] - shader: "unshaded" - visible: false - - state: "id_overlay" - map: [ "enum.PdaVisualLayers.IdLight" ] - shader: "unshaded" - visible: false - - type: Icon - sprite: Objects/Devices/pda.rsi - state: pda - -- type: entity - parent: BasePDA - id: BaseUSSPMedicPDA - description: A basic personal computer for access restriction and organization, manufactured in the USSP. - abstract: true - components: - - type: CartridgeLoader - preinstalled: - - CrewManifestCartridge - - NotekeeperCartridge - - NewsReaderCartridge - - BountyContractsCartridge - - AstroNavCartridge - - MedTekCartridge - - type: Sprite - sprite: Objects/Devices/pda.rsi + sprite: _Mono/Objects/Devices/pda.rsi layers: - map: [ "enum.PdaVisualLayers.Base" ] state: "pda" @@ -56,7 +32,7 @@ shader: "unshaded" visible: false - type: Icon - sprite: Objects/Devices/pda.rsi + sprite: _Mono/Objects/Devices/pda.rsi state: pda - type: entity @@ -66,52 +42,17 @@ components: - type: Pda id: USSPRiflemanIDCard - - type: Appearance - appearanceDataInit: - enum.PdaVisuals.PdaType: - !type:String - pda-interncadet - - type: PdaBorderColor - borderColor: "#717059" - accentVColor: "#A32D26" - - type: Icon - state: pda-interncadet - -- type: entity - parent: BaseUSSPMedicPDA - id: USSPMedicPDA - name: USSP combat medic PDA - components: - - type: Pda - id: USSPMedicIDCard - type: Appearance appearanceDataInit: enum.PdaVisuals.PdaType: !type:String - pda-brigmedic - - type: PdaBorderColor - borderColor: "#A32D26" - accentHColor: "#d7d7d0" - accentVColor: "#d7d7d0" - - type: Icon - state: pda-brigmedic + pda-ussprifleman + - type: Geiger # Mono + showExamine: true + showControl: true + isEnabled: true + attachedToSuit: true # Mono -- type: entity - parent: BaseUSSPPDA - id: USSPCorporalPDA - name: USSP efreitor PDA - components: - - type: Pda - id: USSPCorporalIDCard - - type: Appearance - appearanceDataInit: - enum.PdaVisuals.PdaType: - !type:String - pda-security - - type: PdaBorderColor - borderColor: "#A32D26" - - type: Icon - state: pda-security - type: entity parent: BaseUSSPPDA @@ -124,12 +65,12 @@ appearanceDataInit: enum.PdaVisuals.PdaType: !type:String - pda-seniorofficer - - type: PdaBorderColor - borderColor: "#A32D26" - accentVColor: "#DFDFDF" - - type: Icon - state: pda-seniorofficer + pda-usspsergeant + - type: Geiger # Mono + showExamine: true + showControl: true + isEnabled: true + attachedToSuit: true # Mono - type: entity parent: BaseUSSPPDA @@ -142,12 +83,12 @@ appearanceDataInit: enum.PdaVisuals.PdaType: !type:String - pda-hos - - type: PdaBorderColor - borderColor: "#A32D26" - accentHColor: "#447987" - - type: Icon - state: pda-hos + pda-usspcommissar + - type: Geiger # Mono + showExamine: true + showControl: true + isEnabled: true + attachedToSuit: true # Mono #TSF diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Devices/translators.yml b/Resources/Prototypes/_Mono/Entities/Objects/Devices/translators.yml index bfc0fab713e..e16dbb5a54f 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Devices/translators.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Devices/translators.yml @@ -19,8 +19,7 @@ id: NovaCygniTranslator parent: [ TranslatorPoweredBase ] name: Nova Cygni translator - description: Translates speech between Nova Cygni and Andromeda Standard. - Find out that all the average Radnik says is comrade and glory to the USSP. + description: Translates speech between Nova Cygni and Andromeda Standard. You probably already know the word for comrade. components: - type: HandheldTranslator spoken: diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Misc/books.yml b/Resources/Prototypes/_Mono/Entities/Objects/Misc/books.yml new file mode 100644 index 00000000000..a4dab11aad7 --- /dev/null +++ b/Resources/Prototypes/_Mono/Entities/Objects/Misc/books.yml @@ -0,0 +1,21 @@ +- type: entity + id: BookUSSPLaw + parent: BaseGuidebook + name: USSP Service Regulations + description: A field manual carried by all servicemen of the USSP Armed Forces. Every serzhant can quote it from memory, usually at an intensity unsuitable for cramped spaces. + components: + - type: Sprite + layers: + - state: paper + - state: cover_strong + color: "#665d43" + - state: decor_mono_middle_segmented_top + color: "#b40505" + - state: decor_mono_middle_segmented_bottom + color: "#ffd900" + - type: GuideHelp + guides: + - USSP_Entry + - type: Tag + tags: + - BookUSSPLaw diff --git a/Resources/Prototypes/_Mono/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_Mono/Entities/Structures/Machines/vending_machines.yml index 36a009d54f8..73472546972 100644 --- a/Resources/Prototypes/_Mono/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_Mono/Entities/Structures/Machines/vending_machines.yml @@ -60,7 +60,7 @@ - state: panel map: [ "enum.WiresVisualLayers.MaintenancePanel" ] - type: AccessReader - access: [["Mercenary"], ["Security"]] + access: [["USSP"], ["USSPHigh"]] - type: entity parent: [BaseStructureDisableToolUse, VendingMachineSyndieContraband] diff --git a/Resources/Prototypes/_Mono/Guidebook/factions.yml b/Resources/Prototypes/_Mono/Guidebook/factions.yml index ba1627f85ce..26d7396b58f 100644 --- a/Resources/Prototypes/_Mono/Guidebook/factions.yml +++ b/Resources/Prototypes/_Mono/Guidebook/factions.yml @@ -5,6 +5,7 @@ priority: 1 children: - TSFMC_Entry + - USSP_Entry - type: guideEntry id: TSFMC_Entry @@ -26,3 +27,18 @@ name: Defusal text: "/ServerInfo/Guidebook/Security/Defusal.xml" priority: 5 + +- type: guideEntry + id: USSP_Entry + name: USSP + text: "/ServerInfo/_Mono/Guidebook/Factions/USSP.xml" + priority: 6 + children: + - USSP_SoP + +- type: guideEntry + id: USSP_SoP + name: S.O.P + text: "/ServerInfo/_Mono/Guidebook/Factions/USSP_SOP.xml" + priority: 7 + diff --git a/Resources/Prototypes/_Mono/Loadouts/Mercenary/groups.yml b/Resources/Prototypes/_Mono/Loadouts/Mercenary/groups.yml index b366a90a9db..49e7d10705b 100644 --- a/Resources/Prototypes/_Mono/Loadouts/Mercenary/groups.yml +++ b/Resources/Prototypes/_Mono/Loadouts/Mercenary/groups.yml @@ -110,32 +110,3 @@ - MercenaryClothingBalaclavaSkiMaskTan - MercenaryClothingBalaclavaSkiMaskRangerGreen - MercenaryClothingBalaclavaSkiMaskCoyoteBrown - -- type: loadoutGroup - id: MonoUSSPJumpsuit - name: loadout-group-ussp-jumpsuit - loadouts: - - USSPClothingJumpsuit - -- type: loadoutGroup - id: MonoUSSPHead - name: loadout-group-ussp-head - loadouts: - - USSPOfficerCap - - USSPCommissarCap - -- type: loadoutGroup - id: MonoUSSPOuterClothing - name: loadout-group-ussp-outerclothing - loadouts: - - USSPClothingL10 - - USSPClothingL10A - - USSPClothingCoat - -- type: loadoutGroup - id: MonoUSSPBackpack - name: loadout-group-ussp-backpack - loadouts: - - USSPBackpack - - USSPDuffel - - USSPSatchel diff --git a/Resources/Prototypes/_Mono/Loadouts/USSP/head.yml b/Resources/Prototypes/_Mono/Loadouts/USSP/head.yml index 5c93eb7fada..d6b818e486f 100644 --- a/Resources/Prototypes/_Mono/Loadouts/USSP/head.yml +++ b/Resources/Prototypes/_Mono/Loadouts/USSP/head.yml @@ -1,12 +1,17 @@ - type: loadout id: USSPHelmet equipment: - head: ClothingHeadHelmetMercenaryBlack + head: ClothingHeadHelmetCombatUSSP + +- type: loadout + id: USSPHeavyHelmet + equipment: + head: ClothingHeadHelmetHeavyUSSP - type: loadout id: USSPBeret equipment: - head: ClothingHeadHatBeretSecurity + head: ClothingHeadHatBeret - type: loadout id: USSPOfficerCap diff --git a/Resources/Prototypes/_Mono/Loadouts/USSP/jumpsuit.yml b/Resources/Prototypes/_Mono/Loadouts/USSP/jumpsuit.yml index 61ca7baf62b..b9c1895ceb0 100644 --- a/Resources/Prototypes/_Mono/Loadouts/USSP/jumpsuit.yml +++ b/Resources/Prototypes/_Mono/Loadouts/USSP/jumpsuit.yml @@ -2,3 +2,8 @@ id: USSPClothingJumpsuit equipment: jumpsuit: ClothingUniformUSSP + +- type: loadout + id: USSPClothingServiceDress + equipment: + jumpsuit: ClothingUniformServiceDressUSSP diff --git a/Resources/Prototypes/_Mono/Loadouts/USSP/outerclothing.yml b/Resources/Prototypes/_Mono/Loadouts/USSP/outerclothing.yml index 15a34e9e886..d39b9d7c3c7 100644 --- a/Resources/Prototypes/_Mono/Loadouts/USSP/outerclothing.yml +++ b/Resources/Prototypes/_Mono/Loadouts/USSP/outerclothing.yml @@ -1,12 +1,10 @@ - type: loadout id: USSPClothingL10 - price: 10000 equipment: outerClothing: ClothingOuterHardsuitUsspL10 - type: loadout id: USSPClothingL10A - price: 15000 equipment: outerClothing: ClothingOuterHardsuitUsspL10A diff --git a/Resources/Prototypes/_Mono/Loadouts/USSP/pda.yml b/Resources/Prototypes/_Mono/Loadouts/USSP/pda.yml index 913a87ae5b4..1d3fa673ce9 100644 --- a/Resources/Prototypes/_Mono/Loadouts/USSP/pda.yml +++ b/Resources/Prototypes/_Mono/Loadouts/USSP/pda.yml @@ -14,38 +14,6 @@ fallbacks: - USSPRiflemanPDA -# corporal - -- type: loadout - id: USSPCorporalPDA - equipment: - id: USSPCorporalPDA - -- type: loadoutGroup - id: USSPCorporalPDA - name: loadout-group-contractor-id - hidden: true # No point in showing this, it gets auto-selected. - loadouts: - - USSPCorporalPDA - fallbacks: - - USSPCorporalPDA - -# combat medic - -- type: loadout - id: USSPMedicPDA - equipment: - id: USSPMedicPDA - -- type: loadoutGroup - id: USSPMedicPDA - name: loadout-group-contractor-id - hidden: true # No point in showing this, it gets auto-selected. - loadouts: - - USSPMedicPDA - fallbacks: - - USSPMedicPDA - # sergeant - type: loadout diff --git a/Resources/Prototypes/_Mono/Loadouts/USSP/role_loadouts_ussp.yml b/Resources/Prototypes/_Mono/Loadouts/USSP/role_loadouts_ussp.yml index f0d7bdbbc24..9107fafb4b2 100644 --- a/Resources/Prototypes/_Mono/Loadouts/USSP/role_loadouts_ussp.yml +++ b/Resources/Prototypes/_Mono/Loadouts/USSP/role_loadouts_ussp.yml @@ -3,99 +3,78 @@ groups: - USSPHead - USSPJumpsuit - - TsfmcGloves - - USSPBackpack - - TsfmcOuterClothing - - TsfmcShoes - - TsfmcFace - - USSPBelt - - USSPEars - - NfsdBoxSurvival - - USSPRiflemanPDA - - ContractorWallet - - ContractorEncryptionKey - - NfsdSpeciesSpecific - - UsspFirearm - - UsspMag - -- type: roleLoadout - id: JobUSSPCorporal - groups: - - USSPHead - - USSPJumpsuit - - TsfmcGloves + - USSPGloves - USSPBackpack - USSPOuterClothing - TsfmcShoes - TsfmcFace + - USSPBalaclava + - USSPGlasses - USSPBelt - USSPEars - - NfsdBoxSurvival - - USSPCorporalPDA - - ContractorWallet - ContractorEncryptionKey - - NfsdSpeciesSpecific - - UsspFirearm - - UsspMag - - -- type: roleLoadout - id: JobUSSPMedic - groups: - - USSPHead - - USSPJumpsuit - - TsfmcBrigmedicGloves - - USSPBackpack - - USSPOuterClothing - - TsfmcShoes - - TsfmcFace - - USSPEars - NfsdBoxSurvival - - USSPMedicPDA + - USSPRiflemanPDA - ContractorWallet - - ContractorEncryptionKey + - ContractorCartridge + - ContractorImplanter + - ContractorUtility + - ContractorTrinkets + - ContractorBureaucracy - NfsdSpeciesSpecific - - USSPMedhud - - USSPBeltMedic - UsspFirearm - UsspMag - type: roleLoadout id: JobUSSPSergeant groups: - - USSPJumpsuit - - TsfmcGloves + - USSPHeadOfficer + - USSPJumpsuitOfficer + - USSPGloves - USSPBackpackSergeant + - USSPOuterClothingOfficer - TsfmcShoes - TsfmcFace - - USSPBelt + - USSPBalaclava + - USSPGlasses + - USSPBeltOfficer - USSPEarsCommand + - ContractorEncryptionKey - NfsdBoxSurvival - USSPSergeantPDA - ContractorWallet - - ContractorEncryptionKey + - ContractorCartridge + - ContractorImplanter + - ContractorUtility + - ContractorTrinkets + - ContractorBureaucracy - NfsdSpeciesSpecific - - USSPOuterClothingOfficer - - USSPHeadOfficer - UsspFirearm - UsspMag - type: roleLoadout id: JobUSSPCommissar groups: - - USSPJumpsuit - - TsfmcGloves + - USSPHeadCommissar + - USSPJumpsuitOfficer + - USSPCommissarGloves - USSPBackpackSergeant - USSPOuterClothingOfficer - TsfmcShoes - TsfmcFace - - USSPBelt + - USSPBalaclava + - USSPGlasses + - USSPBeltOfficer - USSPEarsCommand + - ContractorEncryptionKey - NfsdBoxSurvival - USSPCommissarPDA - ContractorWallet - - ContractorEncryptionKey + - ContractorCartridge + - ContractorImplanter + - ContractorUtility + - ContractorTrinkets + - ContractorBureaucracy - NfsdSpeciesSpecific - - USSPHeadCommissar - UsspFirearm - UsspMag diff --git a/Resources/Prototypes/_Mono/Loadouts/USSP/universal_groups.yml b/Resources/Prototypes/_Mono/Loadouts/USSP/universal_groups.yml index 2c83f60f410..f02d8075e8c 100644 --- a/Resources/Prototypes/_Mono/Loadouts/USSP/universal_groups.yml +++ b/Resources/Prototypes/_Mono/Loadouts/USSP/universal_groups.yml @@ -28,31 +28,24 @@ loadouts: - USSPCombatWebbing - USSPCombatWebbingLarge + - USSPCombatWebbingMedical + - MercenaryClothingBeltWebbingsNormalBlack + - MercenaryClothingBeltWebbingsBigBlack + - MercenaryClothingBeltWebbingsNormalRangerGreen + - MercenaryClothingBeltWebbingsBigRangerGreen fallbacks: - USSPCombatWebbing - type: loadoutGroup - id: USSPBeltMedic + id: USSPBeltOfficer name: loadout-group-contractor-belt minLimit: 1 maxLimit: 1 loadouts: - - USSPCombatWebbing - - USSPCombatWebbingLarge - - USSPCombatWebbingMedical - fallbacks: - - USSPCombatWebbingMedical - -#- type: loadoutGroup -# id: USSPBackpackCorporal -# name: loadout-group-contractor-backpack -# minLimit: 1 -# loadouts: -# - USSPModsuitUSSPVaryag -# fallbacks: -# - USSPBackpack -# subgroups: -# - USSPBackpack + - ContractorClothingBeltHolster + - MercenaryClothingBeltSecurityEmpty + subgroups: + - USSPBelt - type: loadoutGroup id: USSPOuterClothingOfficer @@ -62,6 +55,7 @@ - USSPClothingL10A subgroups: - TsfmcOuterClothing + - USSPOuterClothing - type: loadoutGroup id: USSPOuterClothing @@ -82,20 +76,31 @@ - USSPClothingJumpsuit - type: loadoutGroup - id: USSPMedhud - name: loadout-group-contractor-glasses - hidden: true # No point in showing this, it gets auto-selected. + id: USSPJumpsuitOfficer + name: loadout-group-contractor-jumpsuit minLimit: 1 loadouts: - - USSPMedHud + - USSPClothingServiceDress + - USSPClothingJumpsuit fallbacks: + - USSPClothingJumpsuit + +- type: loadoutGroup + id: USSPGlasses + name: loadout-group-contractor-glasses + minLimit: 1 + loadouts: - USSPMedHud + - MercenaryClothingEyesBallisticGogglesGreen + - MercenaryClothingEyesBallisticGogglesRed + - MercenaryClothingEyesGlassesSunglasses - type: loadoutGroup id: USSPHead name: loadout-group-contractor-head loadouts: - USSPHelmet + - USSPHeavyHelmet - USSPBeret - ContractorClothingHeadHatUshanka @@ -132,3 +137,27 @@ loadouts: - USSPOfficerCap - ContractorClothingHeadHatUshanka + subgroups: + - USSPHead + +- type: loadoutGroup + id: USSPGloves + name: loadout-group-contractor-gloves + loadouts: + - MercenaryClothingHandsGlovesTacticalCombatBlack + - MercenaryClothingHandsGlovesTacticalCombatRangerGreen + +- type: loadoutGroup + id: USSPCommissarGloves + name: loadout-group-contractor-gloves + loadouts: + - MercenaryClothingHandsGlovesTacticalCombatWhite + +- type: loadoutGroup + id: USSPBalaclava + name: loadout-group-contractor-balaclava + minLimit: 0 + maxLimit: 1 + loadouts: + - MercenaryClothingBalaclavaSkiMaskBlack + - MercenaryClothingBalaclavaSkiMaskRangerGreen diff --git a/Resources/Prototypes/_Mono/PointsOfInterest/ussp.yml b/Resources/Prototypes/_Mono/PointsOfInterest/ussp.yml index 97f64eb7f42..80a07ef8b1c 100644 --- a/Resources/Prototypes/_Mono/PointsOfInterest/ussp.yml +++ b/Resources/Prototypes/_Mono/PointsOfInterest/ussp.yml @@ -33,7 +33,7 @@ - type: VesselMusic ambientMusicPrototype: CamelotMusic - type: VesselInfo - description: "A rickety old station once owned by a now decrepit interstellar power. Cold and dark." + description: "A rickety old station once the FOB of the USSP Naval Infantry in the Sector. Cold and dark, with a lingering smell of vodka." components: - type: StationNameSetup mapNameTemplate: 'Camelot Station' @@ -46,11 +46,9 @@ lobbySortOrder: 4 - type: StationJobs availableJobs: - # USSPCommissar: [1, 1] - # USSPSergeant: [4, 4] - # USSPCorporal: [6, 6] - # USSPMedic: [4, 4] - # USSPRifleman: [-1, -1] + USSPCommissar: [1, 1] + USSPSergeant: [4, 4] + USSPRifleman: [-1, -1] Contractor: [-1, -1] Pilot: [0, -1] Mercenary: [0, -1] diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/commissar.yml b/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/commissar.yml index 6ebce24b1e9..12261c16f1d 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/commissar.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/commissar.yml @@ -4,22 +4,20 @@ description: job-description-ussp-commissar playTimeTracker: JobUSSPCommissar requirements: - - !type:DepartmentTimeRequirement - department: UnionOfSovietSocialistPlanets - time: 72000 # 20 hours - - !type:RoleTimeRequirement - role: JobUSSPSergeant - time: 10800 # 3 hrs - - !type:RoleTimeRequirement - role: JobUSSPMedic - time: 10800 # 3 hrs + # - !type:DepartmentTimeRequirement # Disabled until newgens get hours in + # department: UnionOfSovietSocialistPlanets + # time: 72000 # 20 hours + # - !type:RoleTimeRequirement + # role: JobUSSPSergeant + # time: 10800 # 3 hrs - !type:OverallPlaytimeRequirement time: 144000 # 40 hrs startingGear: USSPCommissarGear alwaysUseSpawner: true hideConsoleVisibility: true - icon: "JobIconHeadOfSecurity" # TODO - new USSP icons + icon: "JobIconUSSPCommissar" supervisors: job-supervisors-ussp-highcomm + assignedCompany: USSP canBeAntag: false weight: 40 displayWeight: 40 @@ -51,3 +49,4 @@ storage: back: - RadioHandheldNF + - RubberStampUSSP diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/corporal.yml b/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/corporal.yml deleted file mode 100644 index f3379b090a6..00000000000 --- a/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/corporal.yml +++ /dev/null @@ -1,47 +0,0 @@ -- type: job - id: USSPCorporal - name: job-name-ussp-corporal - description: job-description-ussp-corporal - playTimeTracker: JobUSSPCorporal - requirements: - - !type:DepartmentTimeRequirement - department: UnionOfSovietSocialistPlanets - time: 14400 # 4 hours - - !type:OverallPlaytimeRequirement - time: 14400 # 4 hrs - startingGear: USSPCorporalGear - alwaysUseSpawner: true - hideConsoleVisibility: true - icon: "JobIconSecurityOfficer" # TODO - new USSP icons - supervisors: job-supervisors-ussp-sergeant - canBeAntag: false - weight: 20 - displayWeight: 20 - special: - - !type:AddImplantSpecial - implants: [ MindShieldImplant, UsspTrackingImplant ] - - !type:AddComponentSpecial - components: - - type: MailDisabled - - type: SpecialSectorStationRecord - recordGeneration: FalseRecord - - type: NpcFactionMember - factions: - - USSP - - !type:AddLanguageSpecial - languagesSpoken: - - NovaCygniBasic - languagesUnderstood: - - NovaCygniBasic - accessGroups: - - GeneralAccess - - USSPLow - -- type: startingGear - id: USSPCorporalGear - equipment: - pocket1: WeaponPistolPollock - pocket2: Magazine9x19mmPistolFMJ - storage: - back: - - RadioHandheldNF diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/medic.yml b/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/medic.yml deleted file mode 100644 index a0f518576fa..00000000000 --- a/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/medic.yml +++ /dev/null @@ -1,48 +0,0 @@ -- type: job - id: USSPMedic - name: job-name-ussp-medic - description: job-description-ussp-medic - playTimeTracker: JobUSSPMedic - requirements: - - !type:DepartmentTimeRequirement - department: UnionOfSovietSocialistPlanets - time: 14400 # 4 hours - - !type:OverallPlaytimeRequirement - time: 14400 # 4 hrs - startingGear: USSPMedicGear - alwaysUseSpawner: true - hideConsoleVisibility: true - icon: "JobIconBrigmedic" # TODO - new USSP icons - supervisors: job-supervisors-ussp-sergeant - canBeAntag: false - weight: 15 - displayWeight: 15 - special: - - !type:AddImplantSpecial - implants: [ MindShieldImplant, UsspTrackingImplant ] - - !type:AddComponentSpecial - components: - - type: MailDisabled - - type: SpecialSectorStationRecord - recordGeneration: FalseRecord - - type: NpcFactionMember - factions: - - USSP - - !type:AddLanguageSpecial - languagesSpoken: - - NovaCygniBasic - languagesUnderstood: - - NovaCygniBasic - accessGroups: - - GeneralAccess - - USSPLow - -- type: startingGear - id: USSPMedicGear - equipment: - pocket1: WeaponPistolPollock - pocket2: Magazine9x19mmPistolFMJ - storage: - back: - - MedkitCombatFilled - - RadioHandheldNF diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/rifleman.yml b/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/rifleman.yml index 4230b55c621..36cc04ca3a2 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/rifleman.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/rifleman.yml @@ -9,8 +9,9 @@ startingGear: USSPRiflemanGear alwaysUseSpawner: true hideConsoleVisibility: true - icon: "JobIconSecurityCadet" # TODO - new USSP icons + icon: "JobIconUSSPRifleman" supervisors: job-supervisors-ussp-sergeant + assignedCompany: USSP canBeAntag: false weight: 10 displayWeight: 10 diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/sergeant.yml b/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/sergeant.yml index 3fa24ec7e59..6cfedd9d6ab 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/sergeant.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/sergeant.yml @@ -4,16 +4,17 @@ description: job-description-ussp-sergeant playTimeTracker: JobUSSPSergeant requirements: - - !type:DepartmentTimeRequirement - department: UnionOfSovietSocialistPlanets - time: 54000 # 15 hours + # - !type:DepartmentTimeRequirement # Disabled until newgens get hours in + # department: UnionOfSovietSocialistPlanets + # time: 18000 # 5 hours - !type:OverallPlaytimeRequirement time: 72000 # 20 hrs startingGear: USSPSergeantGear alwaysUseSpawner: true hideConsoleVisibility: true - icon: "JobIconSeniorOfficer" # TODO - new USSP icons + icon: "JobIconUSSPSergeant" supervisors: job-supervisors-ussp-commissars + assignedCompany: USSP canBeAntag: false weight: 30 displayWeight: 30 diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/departments.yml b/Resources/Prototypes/_Mono/Roles/Jobs/departments.yml index cf86f66af46..0acb6f5930e 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/departments.yml @@ -18,8 +18,6 @@ roles: - USSPCommissar - USSPSergeant - - USSPCorporal - - USSPMedic - USSPRifleman primary: false - editorHidden: true + diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/play_time_trackers.yml b/Resources/Prototypes/_Mono/Roles/Jobs/play_time_trackers.yml index 6a91ecf898e..57379c6179a 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/play_time_trackers.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/play_time_trackers.yml @@ -1,12 +1,6 @@ - type: playTimeTracker id: JobUSSPCommissar -- type: playTimeTracker - id: JobUSSPCorporal - -- type: playTimeTracker - id: JobUSSPMedic - - type: playTimeTracker id: JobUSSPRifleman diff --git a/Resources/Prototypes/_Mono/Shipyard/USSP/Rams/kopye.yml b/Resources/Prototypes/_Mono/Shipyard/USSP/Rams/kopye.yml index 914bc52cfff..5f58bb1d3ab 100644 --- a/Resources/Prototypes/_Mono/Shipyard/USSP/Rams/kopye.yml +++ b/Resources/Prototypes/_Mono/Shipyard/USSP/Rams/kopye.yml @@ -21,7 +21,7 @@ stationProto: StandardFrontierVessel components: - type: StationNameSetup - mapNameTemplate: 'Kopye MIL Ram{1}' + mapNameTemplate: 'Kopye USSP Ram{1}' nameGenerator: !type:NanotrasenNameGenerator prefixCreator: '14' diff --git a/Resources/Prototypes/_Mono/Shipyard/USSP/Rams/kupol.yml b/Resources/Prototypes/_Mono/Shipyard/USSP/Rams/kupol.yml index 7ee4215ea22..f643eab6290 100644 --- a/Resources/Prototypes/_Mono/Shipyard/USSP/Rams/kupol.yml +++ b/Resources/Prototypes/_Mono/Shipyard/USSP/Rams/kupol.yml @@ -21,7 +21,7 @@ stationProto: StandardFrontierVessel components: - type: StationNameSetup - mapNameTemplate: 'Kupol MIL Ram{1}' + mapNameTemplate: 'Kupol USSP Ram{1}' nameGenerator: !type:NanotrasenNameGenerator prefixCreator: '14' diff --git a/Resources/Prototypes/_Mono/Shipyard/USSP/Rams/molotok.yml b/Resources/Prototypes/_Mono/Shipyard/USSP/Rams/molotok.yml index efa5c58934d..42ce88c2018 100644 --- a/Resources/Prototypes/_Mono/Shipyard/USSP/Rams/molotok.yml +++ b/Resources/Prototypes/_Mono/Shipyard/USSP/Rams/molotok.yml @@ -21,7 +21,7 @@ stationProto: StandardFrontierVessel components: - type: StationNameSetup - mapNameTemplate: 'Molotok MIL Ram{1}' + mapNameTemplate: 'Molotok USSP Ram{1}' nameGenerator: !type:NanotrasenNameGenerator prefixCreator: '14' diff --git a/Resources/Prototypes/_Mono/Shipyard/USSP/akula.yml b/Resources/Prototypes/_Mono/Shipyard/USSP/akula.yml index 57f5cd16884..3321f03ef59 100644 --- a/Resources/Prototypes/_Mono/Shipyard/USSP/akula.yml +++ b/Resources/Prototypes/_Mono/Shipyard/USSP/akula.yml @@ -26,11 +26,11 @@ stationProto: StandardFrontierVessel components: - type: StationNameSetup - mapNameTemplate: 'Akula MIL{1}' + mapNameTemplate: 'Akula USSP{1}' nameGenerator: !type:NanotrasenNameGenerator prefixCreator: '14' - type: StationJobs availableJobs: - Mercenary: [ 0, 0 ] - Pilot: [ 0, 0 ] + USSPSergeant: [ 0, 0 ] + USSPRifleman: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/USSP/buran.yml b/Resources/Prototypes/_Mono/Shipyard/USSP/buran.yml index 320e09bf5ec..fa7a34ffd51 100644 --- a/Resources/Prototypes/_Mono/Shipyard/USSP/buran.yml +++ b/Resources/Prototypes/_Mono/Shipyard/USSP/buran.yml @@ -29,12 +29,12 @@ description: "Outdated, yet still reliable." components: - type: StationNameSetup - mapNameTemplate: 'Buran MIL{1}' + mapNameTemplate: 'Buran USSP{1}' nameGenerator: !type:NanotrasenNameGenerator prefixCreator: '14' - type: StationJobs availableJobs: - Mercenary: [ 0, 0 ] - Pilot: [ 0, 0 ] + USSPSergeant: [ 0, 0 ] + USSPRifleman: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/USSP/drakon.yml b/Resources/Prototypes/_Mono/Shipyard/USSP/drakon.yml index 2a94a127f46..97bed14bea0 100644 --- a/Resources/Prototypes/_Mono/Shipyard/USSP/drakon.yml +++ b/Resources/Prototypes/_Mono/Shipyard/USSP/drakon.yml @@ -27,11 +27,11 @@ stationProto: StandardFrontierVessel components: - type: StationNameSetup - mapNameTemplate: 'Drakon MIL{1}' + mapNameTemplate: 'Drakon USSP{1}' nameGenerator: !type:NanotrasenNameGenerator prefixCreator: '14' - type: StationJobs availableJobs: - Mercenary: [ 0, 0 ] - Pilot: [ 0, 0 ] + USSPSergeant: [ 0, 0 ] + USSPRifleman: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/USSP/gruznyk.yml b/Resources/Prototypes/_Mono/Shipyard/USSP/gruznyk.yml index 7a59e80af1b..9f11df04e34 100644 --- a/Resources/Prototypes/_Mono/Shipyard/USSP/gruznyk.yml +++ b/Resources/Prototypes/_Mono/Shipyard/USSP/gruznyk.yml @@ -27,11 +27,11 @@ stationProto: StandardFrontierVessel components: - type: StationNameSetup - mapNameTemplate: 'Gruznyk MIL{1}' + mapNameTemplate: 'Gruznyk USSP{1}' nameGenerator: !type:NanotrasenNameGenerator prefixCreator: '14' - type: StationJobs availableJobs: - Mercenary: [0, 0] - Pilot: [0, 0] + USSPSergeant: [ 0, 0 ] + USSPRifleman: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/USSP/ledokol.yml b/Resources/Prototypes/_Mono/Shipyard/USSP/ledokol.yml index d8e8f361298..4fa329fb726 100644 --- a/Resources/Prototypes/_Mono/Shipyard/USSP/ledokol.yml +++ b/Resources/Prototypes/_Mono/Shipyard/USSP/ledokol.yml @@ -34,11 +34,11 @@ description: "Why did I come to this sector?" components: - type: StationNameSetup - mapNameTemplate: 'Ledokol MIL{1}' + mapNameTemplate: 'Ledokol USSP{1}' nameGenerator: !type:NanotrasenNameGenerator prefixCreator: '14' - type: StationJobs availableJobs: - Mercenary: [ 0, 0 ] - Pilot: [ 0, 0 ] + USSPSergeant: [ 0, 0 ] + USSPRifleman: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/USSP/natisk.yml b/Resources/Prototypes/_Mono/Shipyard/USSP/natisk.yml index 4219038b4f7..65b02decfb8 100644 --- a/Resources/Prototypes/_Mono/Shipyard/USSP/natisk.yml +++ b/Resources/Prototypes/_Mono/Shipyard/USSP/natisk.yml @@ -26,11 +26,11 @@ stationProto: StandardFrontierVessel components: - type: StationNameSetup - mapNameTemplate: 'Natisk MIL{1}' + mapNameTemplate: 'Natisk USSP{1}' nameGenerator: !type:NanotrasenNameGenerator prefixCreator: '14' - type: StationJobs availableJobs: - Mercenary: [ 0, 0 ] - Pilot: [ 0, 0 ] + USSPSergeant: [ 0, 0 ] + USSPRifleman: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/USSP/remontnik.yml b/Resources/Prototypes/_Mono/Shipyard/USSP/remontnik.yml index c3b428b7c06..a365908128f 100644 --- a/Resources/Prototypes/_Mono/Shipyard/USSP/remontnik.yml +++ b/Resources/Prototypes/_Mono/Shipyard/USSP/remontnik.yml @@ -27,11 +27,11 @@ stationProto: StandardFrontierVessel components: - type: StationNameSetup - mapNameTemplate: 'Remontnik MIL{1}' + mapNameTemplate: 'Remontnik USSP{1}' nameGenerator: !type:NanotrasenNameGenerator prefixCreator: '14' - type: StationJobs availableJobs: - Mercenary: [ 0, 0 ] - Pilot: [ 0, 0 ] + USSPSergeant: [ 0, 0 ] + USSPRifleman: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/USSP/sekunda.yml b/Resources/Prototypes/_Mono/Shipyard/USSP/sekunda.yml index 194a54ede30..06b8e45e4d6 100644 --- a/Resources/Prototypes/_Mono/Shipyard/USSP/sekunda.yml +++ b/Resources/Prototypes/_Mono/Shipyard/USSP/sekunda.yml @@ -28,12 +28,12 @@ stationProto: StandardFrontierVessel components: - type: StationNameSetup - mapNameTemplate: 'Sekunda MIL{1}' + mapNameTemplate: 'Sekunda USSP{1}' nameGenerator: !type:NanotrasenNameGenerator prefixCreator: '14' - type: StationJobs availableJobs: - Mercenary: [ 0, 0 ] - Pilot: [ 0, 0 ] + USSPSergeant: [ 0, 0 ] + USSPRifleman: [ 0, 0 ] #Idfk what im doing I will not lie at all. What am I doing? Hello? Mooooooooooooom? AAAAAAAAAAAAAAAAA! *crashes your entire game and dies* diff --git a/Resources/Prototypes/_Mono/Shipyard/USSP/strayk.yml b/Resources/Prototypes/_Mono/Shipyard/USSP/strayk.yml index 3287edcf54b..4ce3065c451 100644 --- a/Resources/Prototypes/_Mono/Shipyard/USSP/strayk.yml +++ b/Resources/Prototypes/_Mono/Shipyard/USSP/strayk.yml @@ -27,11 +27,11 @@ stationProto: StandardFrontierVessel components: - type: StationNameSetup - mapNameTemplate: 'Strayk MIL{1}' + mapNameTemplate: 'Strayk USSP{1}' nameGenerator: !type:NanotrasenNameGenerator prefixCreator: '14' - type: StationJobs availableJobs: - Mercenary: [ 0, 0 ] - Pilot: [ 0, 0 ] + USSPSergeant: [ 0, 0 ] + USSPRifleman: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/USSP/sulak.yml b/Resources/Prototypes/_Mono/Shipyard/USSP/sulak.yml index 6d098fa13a1..0ba3191234f 100644 --- a/Resources/Prototypes/_Mono/Shipyard/USSP/sulak.yml +++ b/Resources/Prototypes/_Mono/Shipyard/USSP/sulak.yml @@ -27,11 +27,11 @@ stationProto: StandardFrontierVessel components: - type: StationNameSetup - mapNameTemplate: 'Sulak MIL{1}' + mapNameTemplate: 'Sulak USSP{1}' nameGenerator: !type:NanotrasenNameGenerator prefixCreator: '14' - type: StationJobs availableJobs: - Mercenary: [ 0, 0 ] - Pilot: [ 0, 0 ] + USSPSergeant: [ 0, 0 ] + USSPRifleman: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/USSP/svinya.yml b/Resources/Prototypes/_Mono/Shipyard/USSP/svinya.yml index 485c0dac8da..b67f84c6fe8 100644 --- a/Resources/Prototypes/_Mono/Shipyard/USSP/svinya.yml +++ b/Resources/Prototypes/_Mono/Shipyard/USSP/svinya.yml @@ -32,11 +32,11 @@ stationProto: StandardFrontierVessel components: - type: StationNameSetup - mapNameTemplate: 'Svinya MIL{1}' + mapNameTemplate: 'Svinya USSP{1}' nameGenerator: !type:NanotrasenNameGenerator prefixCreator: '14' - type: StationJobs availableJobs: - Mercenary: [ 0, 0 ] - Pilot: [ 0, 0 ] + USSPSergeant: [ 0, 0 ] + USSPRifleman: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/USSP/tayfun.yml b/Resources/Prototypes/_Mono/Shipyard/USSP/tayfun.yml index f6eab7a5d2e..ccc4d999cdc 100644 --- a/Resources/Prototypes/_Mono/Shipyard/USSP/tayfun.yml +++ b/Resources/Prototypes/_Mono/Shipyard/USSP/tayfun.yml @@ -28,11 +28,11 @@ stationProto: StandardFrontierVessel components: - type: StationNameSetup - mapNameTemplate: 'Tayfun MIL{1}' + mapNameTemplate: 'Tayfun USSP{1}' nameGenerator: !type:NanotrasenNameGenerator prefixCreator: '14' - type: StationJobs availableJobs: - Mercenary: [ 0, 0 ] - Pilot: [ 0, 0 ] + USSPSergeant: [ 0, 0 ] + USSPRifleman: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/StatusIcon/job.yml b/Resources/Prototypes/_Mono/StatusIcon/job.yml index bfd2ed1f917..088774c90d4 100644 --- a/Resources/Prototypes/_Mono/StatusIcon/job.yml +++ b/Resources/Prototypes/_Mono/StatusIcon/job.yml @@ -5,3 +5,30 @@ sprite: /Textures/_Mono/Interface/Misc/job_icons.rsi state: TSFEngineer jobName: job-name-tsf-engineer + +- type: jobIcon + parent: JobIcon + id: JobIconUSSPRifleman + icon: + sprite: /Textures/_Mono/Interface/Misc/job_icons.rsi + state: USSPRifleman + jobName: job-name-ussp-rifleman + allowSelection: false + +- type: jobIcon + parent: JobIcon + id: JobIconUSSPSergeant + icon: + sprite: /Textures/_Mono/Interface/Misc/job_icons.rsi + state: USSPSergeant + jobName: job-name-ussp-sergeant + allowSelection: false + +- type: jobIcon + parent: JobIcon + id: JobIconUSSPCommissar + icon: + sprite: /Textures/_Mono/Interface/Misc/job_icons.rsi + state: USSPCommissar + jobName: job-name-ussp-commissar + allowSelection: false diff --git a/Resources/Prototypes/_Mono/Traits/speech.yml b/Resources/Prototypes/_Mono/Traits/speech.yml index d8a54e8f966..e589fbf3f7e 100644 --- a/Resources/Prototypes/_Mono/Traits/speech.yml +++ b/Resources/Prototypes/_Mono/Traits/speech.yml @@ -50,15 +50,15 @@ languagesUnderstood: - Gary -- type: trait - id: MonoNovaCygniBasic - name: trait-language-NovaCygni-name - description: trait-language-NovaCygni-desc - category: LanguageTraits - cost: 1 - components: - - type: LanguageSpeaker - languagesSpoken: - - NovaCygniBasic - languagesUnderstood: - - NovaCygniBasic +# - type: trait +# id: MonoNovaCygniBasic +# name: trait-language-NovaCygni-name +# description: trait-language-NovaCygni-desc +# category: LanguageTraits +# cost: 1 +# components: +# - type: LanguageSpeaker +# languagesSpoken: +# - NovaCygniBasic +# languagesUnderstood: +# - NovaCygniBasic diff --git a/Resources/Prototypes/_Mono/companies.yml b/Resources/Prototypes/_Mono/companies.yml index f313633db33..b069509caa1 100644 --- a/Resources/Prototypes/_Mono/companies.yml +++ b/Resources/Prototypes/_Mono/companies.yml @@ -79,7 +79,7 @@ id: USSP name: USSP color: "#B01340" - disabled: false # Mercs are now USSP-pilled. + disabled: true # USSP are now USSP-pilled. description: ussp-description image: /Textures/_Mono/Companies/USSP.png diff --git a/Resources/Prototypes/_Mono/tags.yml b/Resources/Prototypes/_Mono/tags.yml index 74720a5de74..b5f2b62b4ff 100644 --- a/Resources/Prototypes/_Mono/tags.yml +++ b/Resources/Prototypes/_Mono/tags.yml @@ -584,6 +584,12 @@ - type: Tag id: USSPStamp + +# books + +- type: Tag + id: BookUSSPLaw + # Multi-tile lathe board tags - type: Tag diff --git a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml index f48f5d606c4..9dcf08f55a1 100644 --- a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml @@ -601,7 +601,7 @@ - ContractorClothingHeadsetAltEngineeringCommon - ContractorClothingHeadsetAltMedicalCommon - ContractorClothingHeadsetAltScienceCommon - - USSPHeadset # Mono + # - USSPHeadset # Mono fallbacks: - ContractorClothingHeadsetGreyCommon diff --git a/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml index 574d560f7fd..2b4f2efb588 100644 --- a/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml @@ -15,7 +15,7 @@ - MercenaryClothingUniformJumpsitDrakeIndustriesWatchdog subgroups: - MonoMercenaryJumpsuit # Mono - - MonoUSSPJumpsuit # Mono + # - MonoUSSPJumpsuit # Mono - PilotJumpsuit - ContractorJumpsuit fallbacks: @@ -35,7 +35,7 @@ - SecurityDuffel subgroups: - MonoMercenaryBackpack # Mono - - MonoUSSPBackpack # Mono + # - MonoUSSPBackpack # Mono - PilotBackpack - ContractorBackpack fallbacks: @@ -55,7 +55,7 @@ - MercenaryClothingOuterArmorCaptainCarapace subgroups: - MonoMercenaryOuterClothing # Mono - - MonoUSSPOuterClothing # Mono + # - MonoUSSPOuterClothing # Mono - PilotOuterClothing - ContractorOuterClothing @@ -87,7 +87,7 @@ - SecurityHelmet - SecurityBeret subgroups: - - MonoUSSPHead # Mono + # - MonoUSSPHead # Mono - PilotHead - ContractorHead - MonoMercenaryHead diff --git a/Resources/Prototypes/_NF/Maps/debug.yml b/Resources/Prototypes/_NF/Maps/debug.yml index 1b115a9d05e..80f0a8c46aa 100644 --- a/Resources/Prototypes/_NF/Maps/debug.yml +++ b/Resources/Prototypes/_NF/Maps/debug.yml @@ -57,11 +57,9 @@ TsfBorg: [ -1, -1 ] PdvBorg: [ -1, -1 ] # Prisoner: [ -1, -1] # Mono - # USSPCommissar: [ -1, -1] - # USSPSergeant: [ -1, -1] - # USSPCorporal: [ -1, -1] - # USSPMedic: [ -1, -1] - # USSPRifleman: [ -1, -1] + USSPCommissar: [ -1, -1] + USSPSergeant: [ -1, -1] + USSPRifleman: [ -1, -1] TsfEngineer: [ -1, -1 ] - type: StationDeadDrop maxDeadDrops: 20 # Testing diff --git a/Resources/ServerInfo/_Mono/Guidebook/Factions/USSP.xml b/Resources/ServerInfo/_Mono/Guidebook/Factions/USSP.xml new file mode 100644 index 00000000000..fe73ff599b8 --- /dev/null +++ b/Resources/ServerInfo/_Mono/Guidebook/Factions/USSP.xml @@ -0,0 +1,80 @@ + + # USSP + + The [color=yellow]Union of Soviet Socialist Planets'[/color] 78th Expeditionary Fleet and its attached 13th Naval Infantry Battalion were once tasked with securing the Colossus Sector under Operation Roundtable, the expeditionary fleet was shattered by a sudden and disorganised withdrawal order, with much of it lost in the retreat through the far fringes of the sector. + + Cut off from their distant home and left without further orders from USSP Naval Command, the survivors now endure in isolation. The Naval Infantry, burdened by sustained losses and threadbare leadership, remain a battle-tested but increasingly strained force. Held together by camaraderie, pride, and the stubborn belief that their sacrifice must still have meaning, the Remnants now struggle to preserve what remains, some holding fast to the hope that one day the Union will return, while others begin to doubt that it ever will. + + The detachment's overall objectives, as briefed by Naval Command before deployment to the Colossus sector, are to: + + > Research into the cause and effects of the monolithic emissions + + > Establish control of the sector in the autarch's name + + Detailed objectives for the everyday infantryman will be outlined by the commissar in charge as situations unfold, but with the detachment largely cut off from Naval Command and the outer sectors of Soviet space, the overall task is clear: survival. The men and women of the 13th might very well be called upon to fend off anomalous threats, collect resources from debris and detritus, and study any relevant technology to strengthen their local military. Only through discipline, loyalty to the party and unity can one expect to thrive in this unforgiving sector. + + + # The Chain of Command + + Within the USSP Armed Forces, [color=gold]Commissars[/color] make up the entirety of the formal officer corps. Drawn from the Commissariat and assigned across the branches, they hold command authority while also maintaining discipline, morale, and ideological direction. + + A Commissar is expected to embody the authority and ideals of the Union, and to ensure that military force remains tied to political purpose. For a Commissar, service to the state is service to the people; they are expected to carry that pride visibly, and to serve as a sign to their comrades of what unwavering dedication to the Union can become. + + In practice, their quality as military commanders varies widely. Some are hardened leaders shaped by real service, while others are more bureaucratic than martial, spending more time behind a console than standing before an infantry formation. + + For the Remnants of the 13th, isolation and hardship have shaken the once-great pride and unity of the ranks. The few remaining Commissars stand as the last reminder of the will of the State. Left only with their original mission and silence from their distant home, they now face the labour of unifying the battalion under a common purpose once more. + + The [color=darkyellow]Serzhants[/color] Within the Naval Infantry, a Serzhant is usually among the longest-serving and most reliable comrades in a battalion, trusted not only by their superiors, but by the ranks themselves. + + Promotion to Serzhant is formally initiated by a Commissar, who selects the candidate, but it must then be confirmed through private vote within the battalion, reflecting the common belief across the Armed Forces that leadership among the ranks must be earned as well as granted. + + In practice, Serzhants serve as the bridge between Riflemen and the Commissariat: enforcing standards, carrying hard-won wisdom, and often acting as the voice of reason between the line and command. In battle, Serzhants act as squad leaders and, in the Naval Infantry especially, are often the only leadership physically present among the ranks, with the Commissariat usually commanding remotely through USSP STRATCOMM. + + Among the Remnants of the 13th especially, where losses and isolation have thinned formal leadership, the burden of their responsibility has only grown heavier. + + [color=yellow]Riflemen[/color] The USSP Naval Infantry are not just regular soldiers assigned to ships, but a distinct branch of the Union’s Armed Forces. Separate from the People’s Army and closely intertwined with the Navy, they are trained for boarding actions, small-unit tactics, and the many brutal realities of void warfare. + + The Naval Infantry were founded in the years following the Revolution against the newly forming TSF. During the struggle, the iconic large infantry formations fielded by what would become the People’s Army, while effective in ground combat, proved ill-suited to the realities of fighting in space. + + Once deployed to a theater by the Navy, Naval Infantry units are expected to operate with considerable independence, supported by their own smaller craft and steadfast branch culture. + + Within the USSP military, they are seen as one of the most demanding and prestigious branches, defined by discipline, cohesion, and the expectation that they live up to the prestige placed upon them by the Union. + + # Gear + + + + + + + + The USSP's ground combat doctrine involves primarilly ballistic weapons, namely the AK weapons platform along with 4 gauge shotguns and light machine guns. + + [color=green]Strengths: + - USSP weapons for the most part use a variety of common calibers. + - Their 4 gauges can load flashbangs, useful for disorientating chimeras and other OPFORs + - Their research grants insight into a wider array of explosives. + + [color=red]Weaknesses: + - The 9mm and 7.39mm cartridges used in standard firearms lack a bit of firepower compared to their larger counterparts. + - The DP29 lacks the ammo capacity that the Ratel and Grizzly possess. + - Inadequate anti-mech response outside of 12 and 4 gauge slugs. + - What you see is generally what you get, lacking any of the fancy schticks TSF or PDV weapons possess. + + + + + + + + The 13th Naval Infantry makes use of general purpose hardsuits, with a couple of MODsuits mixed in. + + [color=green]Strengths: + - The L-line of suits all have MEDhuds, allowing for a slightly more diverse eye loadout. + - The Varyag and Zastavnik MODsuits allow the flexible use of ground combat armors or lighter, less protected hardsuits. The Zastavnik in particular has HUD modules. + + [color=red]Weaknesses: + - Their armors don't quite reach the durability of the Cybersuit Juggernaut Suits nor do they possess integrated shields. + - They lack diagnostic HUDs, sorry IPCs. + + diff --git a/Resources/ServerInfo/_Mono/Guidebook/Factions/USSP_SOP.xml b/Resources/ServerInfo/_Mono/Guidebook/Factions/USSP_SOP.xml new file mode 100644 index 00000000000..eca3a779896 --- /dev/null +++ b/Resources/ServerInfo/_Mono/Guidebook/Factions/USSP_SOP.xml @@ -0,0 +1,34 @@ + + #USSP SOP + + [color=yellow]Article 1.[/color] + The serviceman of the Union serves the people, the Party, and the State, and shall conduct himself in a manner worthy of that duty. + + [color=yellow]Article 2.[/color] + Discipline is the foundation of service. Orders lawfully given are to be carried out promptly, exactly, and without self-serving interpretation. + + [color=yellow]Article 3.[/color] + The serviceman shall preserve his weapon, equipment, uniform, and post in proper order. Property of the Armed Forces is property of the people and shall not be wasted through negligence, vanity, or neglect. + + [color=yellow]Article 4.[/color] + Comradeship is a duty of service. A serviceman shall not abandon his comrades, nor act in a manner that weakens unit cohesion, morale, or readiness. + + [color=yellow]Article 5.[/color] + The serviceman shall be vigilant against cowardice, indiscipline, corruption, defeatism, and hostile influence in all forms. + + [color=yellow]Article 6.[/color] + In hardship, isolation, or combat, the serviceman is expected to preserve order, clarity, and fidelity to the Union. + + [color=yellow]Article 7.[/color] + Technical competence, useful labour, and calm conduct under pressure bring credit to the Armed Forces no less than courage in battle. + + [color=yellow]Article 8.[/color] + The conduct of the serviceman toward civilians shall be firm, correct, and restrained. Abuse of authority dishonours both the uniform and the Union. + + [color=yellow]Article 9.[/color] + A serviceman of the USSP is judged not only by victory, but by steadiness, reliability, and the example he sets for others. + + [color=yellow]Article 10.[/color] + A serviceman, regardless of rank, accused of misconduct in his post, may face court martial whenever possible. Such matters are expected to receive proper review, testimony, and the fair judgement of equals. + + diff --git a/Resources/Textures/Objects/Misc/books.rsi/decor_mono_middle_segmented_bottom.png b/Resources/Textures/Objects/Misc/books.rsi/decor_mono_middle_segmented_bottom.png new file mode 100644 index 00000000000..3243766e2cf Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/decor_mono_middle_segmented_bottom.png differ diff --git a/Resources/Textures/Objects/Misc/books.rsi/decor_mono_middle_segmented_top.png b/Resources/Textures/Objects/Misc/books.rsi/decor_mono_middle_segmented_top.png new file mode 100644 index 00000000000..b88f447e0a3 Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/decor_mono_middle_segmented_top.png differ diff --git a/Resources/Textures/Objects/Misc/books.rsi/meta.json b/Resources/Textures/Objects/Misc/books.rsi/meta.json index 96320ce6ac5..bf399199069 100644 --- a/Resources/Textures/Objects/Misc/books.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/books.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Base sprite taken at: https://github.com/tgstation/tgstation/commit/37fb6bc6dd20005775dde8d886f48f7722606b77 , splitted on layers by TheShuEd (github)", + "copyright": "Base sprite taken at: https://github.com/tgstation/tgstation/commit/37fb6bc6dd20005775dde8d886f48f7722606b77 , splitted on layers by TheShuEd (github), segmented middle sprites added by Mrrpip", "size": { "x": 32, "y": 32 @@ -43,6 +43,12 @@ { "name": "decor_vertical_middle" }, + { + "name": "decor_mono_middle_segmented_top" + }, + { + "name": "decor_mono_middle_segmented_bottom" + }, { "name": "detail_bookmark" }, diff --git a/Resources/Textures/_Mono/Clothing/Head/Helmets/ussp_combat_helmet.rsi/equipped-HELMET.png b/Resources/Textures/_Mono/Clothing/Head/Helmets/ussp_combat_helmet.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..30a537c137d Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Head/Helmets/ussp_combat_helmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Helmets/ussp_combat_helmet.rsi/icon.png b/Resources/Textures/_Mono/Clothing/Head/Helmets/ussp_combat_helmet.rsi/icon.png new file mode 100644 index 00000000000..7f42fab1b44 Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Head/Helmets/ussp_combat_helmet.rsi/icon.png differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Helmets/ussp_combat_helmet.rsi/inhand-left.png b/Resources/Textures/_Mono/Clothing/Head/Helmets/ussp_combat_helmet.rsi/inhand-left.png new file mode 100644 index 00000000000..939c347bf79 Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Head/Helmets/ussp_combat_helmet.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Helmets/ussp_combat_helmet.rsi/inhand-right.png b/Resources/Textures/_Mono/Clothing/Head/Helmets/ussp_combat_helmet.rsi/inhand-right.png new file mode 100644 index 00000000000..95fe4722781 Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Head/Helmets/ussp_combat_helmet.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Helmets/ussp_combat_helmet.rsi/meta.json b/Resources/Textures/_Mono/Clothing/Head/Helmets/ussp_combat_helmet.rsi/meta.json new file mode 100644 index 00000000000..5eb25fb9560 --- /dev/null +++ b/Resources/Textures/_Mono/Clothing/Head/Helmets/ussp_combat_helmet.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "modified sprite from Jackal298 based on the sprite from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1 | Modified by Peter Poley for Starlight | Recoloured by GOLDMASK990 for Mono", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Mono/Clothing/Uniforms/Jumpsuit/ussp_service_dress.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Mono/Clothing/Uniforms/Jumpsuit/ussp_service_dress.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000..d886cee75a3 Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Uniforms/Jumpsuit/ussp_service_dress.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/_Mono/Clothing/Uniforms/Jumpsuit/ussp_service_dress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Mono/Clothing/Uniforms/Jumpsuit/ussp_service_dress.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..4f332c6bdcd Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Uniforms/Jumpsuit/ussp_service_dress.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_Mono/Clothing/Uniforms/Jumpsuit/ussp_service_dress.rsi/icon.png b/Resources/Textures/_Mono/Clothing/Uniforms/Jumpsuit/ussp_service_dress.rsi/icon.png new file mode 100644 index 00000000000..aebc25c66c9 Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Uniforms/Jumpsuit/ussp_service_dress.rsi/icon.png differ diff --git a/Resources/Textures/_Mono/Clothing/Uniforms/Jumpsuit/ussp_service_dress.rsi/inhand-left.png b/Resources/Textures/_Mono/Clothing/Uniforms/Jumpsuit/ussp_service_dress.rsi/inhand-left.png new file mode 100644 index 00000000000..aa8cb36bcea Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Uniforms/Jumpsuit/ussp_service_dress.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Mono/Clothing/Uniforms/Jumpsuit/ussp_service_dress.rsi/inhand-right.png b/Resources/Textures/_Mono/Clothing/Uniforms/Jumpsuit/ussp_service_dress.rsi/inhand-right.png new file mode 100644 index 00000000000..7d81307da05 Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Uniforms/Jumpsuit/ussp_service_dress.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Mono/Clothing/Uniforms/Jumpsuit/ussp_service_dress.rsi/meta.json b/Resources/Textures/_Mono/Clothing/Uniforms/Jumpsuit/ussp_service_dress.rsi/meta.json new file mode 100644 index 00000000000..f931668db57 --- /dev/null +++ b/Resources/Textures/_Mono/Clothing/Uniforms/Jumpsuit/ussp_service_dress.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from ParadiseSS13 https://github.com/ParadiseSS13/Paradise/pull/20669 by JustAdler for Starlight, ported to Mono by Goldmask990", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/USSPCommissar.png b/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/USSPCommissar.png new file mode 100644 index 00000000000..33bb386a42b Binary files /dev/null and b/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/USSPCommissar.png differ diff --git a/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/USSPRifleman.png b/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/USSPRifleman.png new file mode 100644 index 00000000000..0ca01f6da42 Binary files /dev/null and b/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/USSPRifleman.png differ diff --git a/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/USSPSergeant.png b/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/USSPSergeant.png new file mode 100644 index 00000000000..4611bf46343 Binary files /dev/null and b/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/USSPSergeant.png differ diff --git a/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/meta.json index 62b55b09a18..e16fd024a9d 100644 --- a/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Color swapped from Station Engineer job icon from Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi", + "copyright": "Color swapped from Station Engineer job icon from Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | USSPCommissar adapted from Soviet icon from Starlight, credited there to Paradise SS13 | USSPSergeant adapted from SalvageLead icon from Starlight, credited there to mikeysaurus | USSPRifleman adapted from Revolutionary icon from Space Station 14 / WizDen", "size": { "x": 8, @@ -25,6 +25,15 @@ }, { "name": "PDVAsvaran" + }, + { + "name": "USSPCommissar" + }, + { + "name": "USSPRifleman" + }, + { + "name": "USSPSergeant" } ] } diff --git a/Resources/Textures/_Mono/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/_Mono/Objects/Devices/pda.rsi/meta.json index 745f552feec..33f3063dfae 100644 --- a/Resources/Textures/_Mono/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/_Mono/Objects/Devices/pda.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "aPDA retexture by ZweiHawke @ zweihawke.net. PDV sprites made by DieselMohawk, ported by Arcticular1 and Thoughtlessuser", + "copyright": "aPDA retexture by ZweiHawke @ zweihawke.net. PDV sprites made by DieselMohawk, ported by Arcticular1 and Thoughtlessuser. USSP Sprites by GOLDMASK990", "size": { "x": 32, "y": 32 @@ -46,6 +46,15 @@ }, { "name": "pda-denasvar" + }, + { + "name": "pda-ussprifleman" + }, + { + "name": "pda-usspsergeant" + }, + { + "name": "pda-usspcommissar" } ] } diff --git a/Resources/Textures/_Mono/Objects/Devices/pda.rsi/pda-usspcommissar.png b/Resources/Textures/_Mono/Objects/Devices/pda.rsi/pda-usspcommissar.png new file mode 100644 index 00000000000..9dac091a6ef Binary files /dev/null and b/Resources/Textures/_Mono/Objects/Devices/pda.rsi/pda-usspcommissar.png differ diff --git a/Resources/Textures/_Mono/Objects/Devices/pda.rsi/pda-ussprifleman.png b/Resources/Textures/_Mono/Objects/Devices/pda.rsi/pda-ussprifleman.png new file mode 100644 index 00000000000..a4370c337f9 Binary files /dev/null and b/Resources/Textures/_Mono/Objects/Devices/pda.rsi/pda-ussprifleman.png differ diff --git a/Resources/Textures/_Mono/Objects/Devices/pda.rsi/pda-usspsergeant.png b/Resources/Textures/_Mono/Objects/Devices/pda.rsi/pda-usspsergeant.png new file mode 100644 index 00000000000..638efddcf7d Binary files /dev/null and b/Resources/Textures/_Mono/Objects/Devices/pda.rsi/pda-usspsergeant.png differ