Merge PR #28 (Loadouts1)

Loadouts1
EndrAnimet · May 16, 2024 · 9bb99a0 · 9bb99a0
2 parents c290d54 + ae2e2ba
commit 9bb99a0
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 19 deletions.
diff --git 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
@@ -1,7 +1,16 @@
 - type: roleLoadout
   id: JobIAA
   groups:
-  - LawyerNeck
   - LawyerJumpsuit
   - CommonBackpack
   - Trinkets
+
+- type: roleLoadout
+  id: JobPilot
+  groups:
+  - SecurityHead
+  - SecurityJumpsuit
+  - SecurityBackpack
+  - SecurityOuterClothing
+  - SecurityBelt
+  - Trinkets
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
+    pocket2: MagazineUniversalMagnum
diff --git a/Resources/Prototypes/Stray/Loadouts/role_loadouts.yml b/Resources/Prototypes/Stray/Loadouts/role_loadouts.yml
@@ -0,0 +1,6 @@
+- type: roleLoadout
+  id: JobBlueshield
+  groups:
+  - BrigMedicJumpsuit
+  - BrigMedicBack
+  - Trinkets