diff --git a/Resources/Audio/Announcements/attributions.yml b/Resources/Audio/Announcements/attributions.yml index 0a8c45806ac..f73aa705f3a 100644 --- a/Resources/Audio/Announcements/attributions.yml +++ b/Resources/Audio/Announcements/attributions.yml @@ -42,7 +42,7 @@ license: "CC-BY-SA-3.0" copyright: "Paradise, volume and pitch changed, merged with redalert.ogg" source: "https://github.com/ParadiseSS13/Paradise/blob/07b26ee6b4a11a0607986d322ee007020569feae/sound/effects/siren.ogg" - + - files: ["aliens.ogg", "attention.ogg", "meteors.ogg", "outbreak7.ogg", "power_off.ogg", "power_on.ogg", "radiation.ogg", "shuttle_dock.ogg", "shuttlecalled.ogg", "shuttlerecalled.ogg", "ventclog.ogg", "war.ogg", "welcome.ogg"] license: "CC-BY-SA-3.0" copyright: "discord:Basia (437113799137427460)" diff --git a/Resources/Prototypes/Corvax/Loadouts/role_loadouts.yml b/Resources/Prototypes/Corvax/Loadouts/role_loadouts.yml index 517d6bd437d..dbfc33195bd 100644 --- a/Resources/Prototypes/Corvax/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Corvax/Loadouts/role_loadouts.yml @@ -1,7 +1,16 @@ - type: roleLoadout id: JobIAA groups: - - LawyerNeck - LawyerJumpsuit - CommonBackpack - Trinkets + +- type: roleLoadout + id: JobPilot + groups: + - SecurityHead + - SecurityJumpsuit + - SecurityBackpack + - SecurityOuterClothing + - SecurityBelt + - Trinkets \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml b/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml index a6f239ed530..517cc05a756 100644 --- a/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml +++ b/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml @@ -22,8 +22,6 @@ - type: startingGear id: IAAGear equipment: - jumpsuit: ClothingUniformJumpsuitLawyerBlack # TODO change jumpsuit to randomiser of the 4 variants - back: ClothingBackpackIAAFilled shoes: ClothingShoesColorBlack id: IAAPDA eyes: ClothingEyesGlassesSunglasses diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml b/Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml index 424607f07b2..4d6d82ef0f4 100644 --- a/Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml +++ b/Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml @@ -23,11 +23,8 @@ - type: startingGear id: PilotGear equipment: - jumpsuit: ClothingUniformJumpsuitSeniorOfficer shoes: ClothingShoesBootsCombatFilled eyes: ClothingEyesGlassesSecurity - head: ClothingHeadHatBeretSecurity - outerClothing: ClothingOuterVestArmorSec id: PilotPDA ears: ClothingHeadsetSecurity neck: ClothingNeckTieRed diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml index 7104598b3ae..6f72222bfb2 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml @@ -16,7 +16,7 @@ requirement: !type:DepartmentTimeRequirement department: Engineering - time: 216000 # 60 hrs + time: 21600 #6 hrs # Head - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml index 7e4732cd03b..62326c1e2ea 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml @@ -6,17 +6,17 @@ requirement: !type:RoleTimeRequirement role: JobChemist - time: 21600 #6 hrs + time: 7200 #2 hrs - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement role: JobMedicalDoctor - time: 21600 #6 hrs + time: 7200 #2 hrs - !type:JobRequirementLoadoutEffect requirement: !type:DepartmentTimeRequirement department: Medical - time: 216000 # 60 hrs + time: 7200 #2 hrs # Head diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml index 63312b6dd68..a86b8174fdc 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml @@ -6,7 +6,7 @@ requirement: !type:DepartmentTimeRequirement department: Epistemics - time: 216000 #60 hrs + time: 7200 #2 hrs # Head diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml index c3aac85be48..d65729082a7 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml @@ -11,7 +11,7 @@ requirement: !type:DepartmentTimeRequirement department: Security - time: 216000 # 60 hrs + time: 7200 # 3 hrs # Head - type: loadout diff --git a/Resources/Prototypes/Roles/Jobs/Command/blueshield.yml b/Resources/Prototypes/Roles/Jobs/Command/blueshield.yml index 652812a2af7..ade8ccfb230 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/blueshield.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/blueshield.yml @@ -36,8 +36,6 @@ id: BlueshieldGear equipment: head: ClothingHeadHatBeretCorpsman - jumpsuit: ClothingUniformJumpskirtSecBlue - back: ClothingBackpackBrigmedicDeltaVFilled shoes: ClothingShoesBootsCombatFilled eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesCombat @@ -46,7 +44,4 @@ ears: ClothingHeadsetCentCom belt: ClothingBeltCorpsmanWebbingFilled pocket1: WeaponPistolUniversal - pocket2: MagazineUniversalMagnum - innerClothingSkirt: ClothingUniformJumpskirtSecBlue - satchel: ClothingBackpackSatchelBrigmedicDeltaVFilled - duffelbag: ClothingBackpackDuffelBrigmedicDeltaVFilled \ No newline at end of file + pocket2: MagazineUniversalMagnum \ No newline at end of file diff --git a/Resources/Prototypes/Stray/Loadouts/role_loadouts.yml b/Resources/Prototypes/Stray/Loadouts/role_loadouts.yml new file mode 100644 index 00000000000..908f2e914e1 --- /dev/null +++ b/Resources/Prototypes/Stray/Loadouts/role_loadouts.yml @@ -0,0 +1,6 @@ +- type: roleLoadout + id: JobBlueshield + groups: + - BrigMedicJumpsuit + - BrigMedicBack + - Trinkets \ No newline at end of file