Merge branch 'dbg' of github.com:SpicyDarkFox/LPP_verse into dbg

Lost-Paradise-Project · Sep 6, 2024 · e90c931 · e90c931
2 parents 1acf34c + 7d63c3f
commit e90c931
Show file tree

Hide file tree

Showing 71 changed files with 291 additions and 190 deletions.
diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml
@@ -104,3 +104,10 @@ Entries:
   id: 11
   time: '2024-09-05T12:18:27.0000000+00:00'
   url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/69
+- author: JayJacobs
+  changes:
+    - type: Tweak
+      message: Изменено время начальных ролей.
+  id: 12
+  time: '2024-09-06T12:30:02.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/74
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml
@@ -8,6 +8,9 @@
     contents:
       - id: ClothingOuterArmorPlateCarrier # DeltaV - ClothingOuterArmorBulletproof replaced in favour of plate carrier
         amount: 3
+#LPP
+      - id: LPPClothingOuterHardsuitReflectivepatrolsec
+        prob: 0.3
 
 - type: entity
   id: CrateSecurityHelmet

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
@@ -109,7 +109,7 @@
         prob: 0.3
       - id: ClothingMaskSterile
       - id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes!
-        prob: 0.3 
+        prob: 0.3
 
 - type: entity
   parent: LockerWallMedical
@@ -145,7 +145,7 @@
         orGroup: Surgshrubs
       - id: ClothingMaskSterile
       - id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes!
-        prob: 0.3 
+        prob: 0.3
 
 - type: entity
   id: LockerChemistryFilled
@@ -187,7 +187,7 @@
       - id: MedkitFilled
         prob: 0.3
       - id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes!
-        prob: 0.3 
+        prob: 0.3
 
 - type: entity
   id: LockerParamedicFilledHardsuit #Delta V - Paramedic locker with suit
@@ -196,7 +196,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingOuterHardsuitVoidParamed
+      - id: LPPHardsuitAssaultParamedic #LPP
       - id: ClothingOuterCoatParamedicWB
       - id: ClothingHeadHatParamedicsoft
       - id: ClothingOuterWinterPara
@@ -211,4 +211,4 @@
       - id: MedkitFilled
         prob: 0.3
       - id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes!
-        prob: 0.3 
+        prob: 0.3
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -26,6 +26,11 @@
       - id: BoxEncryptionKeyPrisoner #Delta-V
       - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
         prob: 0.3
+#LPP
+      - id: LPPWeaponPistolPF20
+      - id: LPPMagazinePistolPF20lethal
+      - id: LPPMagazinePistolPF20Rubber
+        prob: 0.5 #Кибербуллинг метаюзеров :D
 
 - type: entity
   id: LockerWardenFilled
@@ -54,6 +59,11 @@
       - id: BoxEncryptionKeyPrisoner #Delta-V
       - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
         prob: 0.3
+#LPP
+      - id: LPPWeaponPistolPF20
+      - id: LPPMagazinePistolPF20lethal
+      - id: LPPMagazinePistolPF20Rubber
+        prob: 0.5 #Кибербуллинг метаюзеров :D
 
 - type: entity
   id: LockerSecurityFilled
@@ -99,6 +109,13 @@
         prob: 0.6
       - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
         prob: 0.3
+#LPP
+      - id: ClothingOuterHardsuitSanta
+        prob: 0.01
+      - id: ClothingOuterHardsuitClown
+        prob: 0.01
+      - id: ClothingMaskClown
+        prob: 0.1
 
 - type: entity
   id: LockerBrigmedicFilled
@@ -197,6 +214,8 @@
       - id: BoxEvidenceMarkers
       - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
         prob: 0.3
+#LPP
+      - id: LPPClothingOuterDetectiveHardsuit
 
 - type: entity
   id: ClosetBombFilled

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -257,7 +257,7 @@
     contents:
         - id: NitrogenTankFilled
         - id: OxygenTankFilled
-        - id: ClothingOuterHardsuitVoidParamed
+        - id: LPPHardsuitAssaultParamedic #Изменение от LPP
         - id: ClothingMaskBreathMedical
   - type: AccessReader
     access: [ [ "Paramedic" ] ]

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml
@@ -14,3 +14,16 @@
     ClothingOuterWinterAtmos: 2
     ClothingNeckScarfStripedLightBlue: 3
     ClothingShoesBootsWinterAtmos: 2 #Delta V: Add departmental winter boots
+#LPP
+    LPPAtmosBlackSkirt: 3
+    LPPAtmostechjean: 3
+    LPPGorkaAtmos: 3
+    LPPGorkaWithReflectorsAtmos: 3
+    LPPQmcAtmos: 3
+    LPPQmsyndAtmos: 3
+    LPPSkirtleneckAtmos: 3
+    LPPSkirtleneckQMAtmos: 3
+    LPPSupplyChiefAtmos: 3
+    LPPSupplyChiefSkirtAtmos: 3
+    LPPTurtleneckQmAtmos: 3
+    LPPUtilAtmos: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml
@@ -20,4 +20,5 @@
     ClothingOuterApronChemist: 2 # Realistic PPE apron for chemistry
     ClothingEyesGlassesChemist: 2 # Safety glasses
     ClothingHandsGlovesChemist: 2 # Heavy duty chemistry gloves
-    # End of modified code
+    # End of modified code
+    LPPChemistHudGlasses: 2 #LPP-Edit's
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -21,7 +21,57 @@
     ClothingHandsGlovesColorBlack: 4
     ClothingEyesGlassesCheapSunglasses: 2
     ClothingClothWrap: 4
+#LPP
+    LPPWaistbag01: 3
+    LPPWaistbag02: 3
+    LPPWaistbag03: 3
+    LPPWaistbag04: 3
+    LPPWaistbag05: 3
+    LPPWaistbag06: 3
+    LPPWaistbag07: 3
+    LPPWaistbag08: 3
+    LPPWaistbag09: 3
+    LPPWaistbag10: 3
+    LPPUnathiWraps: 3
+    LPPDeckerJumpsuit: 3
+    LPPDraculass: 3
+    LPPDrfreeze: 3
+    LPPKilt: 3
+    LPPMaid: 3
+    LPPSchoolgirl: 3
+    LPPSchoolgirlgreen: 3
+    LPPSchoolgirlorange: 3
+    LPPSchoolgirlred: 3
+    LPPSwagOutfit: 3
+    LPPSwagShoes: 3
+    LPPGlowShoes: 3
+    LPPIceboots: 3
+    LPPRainBow: 3
+    LPPBlackFlannelJumpsuit: 2
+    LPPGreenFlannelJumpsuit: 2
+    LPPOrangeFlannelJumpsuit: 2
+    LPPClothingNeckNeckerchiefGreen: 5
+    LPPClothingNeckNeckerchiefPurple: 5
+    LPPClothingNeckNeckerchiefRed: 5
+    LPPClothingHeadHatCapRed: 4
+    LPPClothingHeadHatCapBlack: 4
+    LPPClothingHeadHatCapGreen: 4
+    LPPClothingHeadHatCapBlue: 4
+    LPPClothingUniformGreenTracksuit: 4
+    LPPClothingUniformBlackTracksuit: 4
+    LPPClothingUniformBlueTracksuit: 4
+    LPPClothingUniformRedTracksuit: 4
   contrabandInventory:
     ClothingMaskNeckGaiter: 2
     ClothingUniformJumpsuitTacticool: 1
     ClothingUniformJumpskirtTacticool: 1
+    ClothingEyesGlassesSunglasses: 2
+    ClothingHandsGlovesColorBlack: 4
+    ClothingHandsGlovesColorGray: 4
+    ClothingHandsGlovesColorBrown: 2
+    ClothingHandsGlovesColorWhite: 2
+    ClothingHandsGlovesColorRed: 2
+    ClothingHandsGlovesColorBlue: 2
+    ClothingHandsGlovesColorGreen: 2
+    ClothingHandsGlovesColorOrange: 2
+    ClothingHandsGlovesColorPurple: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
@@ -16,3 +16,17 @@
     ClothingOuterWinterEngi: 2
     ClothingNeckScarfStripedOrange: 3
     ClothingShoesBootsWinterEngi: 2
+#LPP
+    LPPEngiBlackSkirt: 3
+    LPPEngiTechjean: 3
+    LPPGorkaEngi: 3
+    LPPGorkaWithReflectorsEngi: 3
+    LPPQmcEngi: 3
+    LPPQmsyndEngi: 3
+    LPPSkirtleneckEngi: 3
+    LPPSkirtleneckQMEngi: 3
+    LPPSupplyChiefEngi: 3
+    LPPSupplyChiefSkirtEngi: 3
+    LPPTurtleneckQmEngi: 3
+    LPPUtilEngi: 3
+    LPPClothingOuterCoatEngie: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
@@ -18,10 +18,23 @@
     UniformScrubsColorGreen: 4
     UniformScrubsColorBlue: 4
     UniformScrubsColorPurple: 4
-    ClothingHeadHatSurgcapGreen: 4 
+    ClothingHeadHatSurgcapGreen: 4
     ClothingHeadHatSurgcapBlue: 4
     ClothingHeadHatSurgcapPurple: 4
     ClothingShoesBootsWinterMed: 2
+#LPP
+    LPPMedicBlackSkirt: 4
+    LPPMedictechjean: 4
+    LPPGorkaMedic: 4
+    LPPGorkaMedicVarg: 4
+    LPPQmcMedic: 4
+    LPPQmsyndMedic: 4
+    LPPSkirtleneckMedic: 4
+    LPPSkirtleneckQMMedic: 4
+    LPPSupplyChiefMedic: 4
+    LPPSupplyChiefSkirtMedic: 4
+    LPPTurtleneckQmMedic: 4
+    LPPUtilMedic: 4
   contrabandInventory: #DeltaV
     UniformScrubsColorCybersun: 1 #DeltaV
     ClothingHeadHatSurgcapCybersun: 1 #DeltaV

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml
@@ -13,3 +13,8 @@
     SeismicCharge: 2
     FultonBeacon: 1
     Fulton: 2
+#LPP
+    WeaponCrusherDagger: 2
+  ContrabandInventory:
+    LPPWeaponSyndieGlaive: 1
+    ClothingBackpackDuffelSyndicate: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
@@ -16,3 +16,24 @@
     ClothingNeckScarfStripedPurple: 3
     ClothingHeadTinfoil: 2 # Nyanotrasen - Tinfoil hats for Epistemics
     ClothingShoesBootsWinterSci: 2
+#LPP
+    LPPRndBlackSkirt: 3
+    LPPRndtechjean: 3
+    LPPGorkaRnd: 3
+    LPPGorkaRndVarg: 3
+    LPPQmcRnd: 3
+    LPPQmsyndRnd: 3
+    LPPSkirtleneckRnd: 3
+    LPPSkirtleneckQMRnd: 3
+    LPPSupplyChiefRnd: 3
+    LPPSupplyChiefSkirtRnd: 3
+    LPPTurtleneckQmRnd: 3
+    LPPUtilRnd: 3
+    ClothingOuterCoatRnd: 3
+    ClothingShoesColorWhite: 3
+    ClothingNeckTieSci: 3
+    ClothingHeadsetScience: 3
+    ClothingMaskGas: 3
+    ClothingOuterWinterSci: 2
+    ClothingNeckScarfStripedPurple: 3
+    ClothingShoesBootsWinterSci: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
@@ -30,3 +30,4 @@
     FoodDonutHomer: 12
     FoodBoxDonut: 2
     #box evidence
+    LPPTelebaton: 3 #LPP
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
@@ -26,4 +26,29 @@
     ClothingShoesBootsCombat: 1
     ClothingShoesBootsWinterSec: 2
     ClothingShoesBootsCowboyBlack: 1
-    ClothingHeadHatCowboyBlack: 1
+    ClothingHeadHatCowboyBlack: 1
+##LPP
+    LPPSecBlackSkirt: 3
+    LPPSectechjean: 3
+    LPPGorkaSec: 3
+    LPPGorkaSecVarg: 3
+    LPPQmcSec: 3
+    LPPQmsyndSec: 3
+    LPPSkirtleneckSec: 3
+    LPPSkirtleneckQMSec: 3
+    LPPSupplyChiefSec: 3
+    LPPSupplyChiefSkirtSec: 3
+    LPPTurtleneckQmSec: 3
+    LPPUtilSec: 3
+    LPPTacticoolSec: 3
+    ClothingEyesHudSecurity: 2
+    ClothingMaskNeckGaiter: 2
+    LPPClothingMaskBandageBlack: 2
+    LPPClothingMaskBandageRed: 1
+    LPPClothingHeadHatRedBandana: 1
+    LPPClothingMaskBandageSkull: 1
+    ClothingHeadBandBlack: 2
+    ClothingHeadBandSkull: 1
+    LPPClothingHeadSecHat: 2
+  ContrabandInventory:
+    ClothingMaskClownSecurity: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/virodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/virodrobe.yml
@@ -11,3 +11,22 @@
     ClothingBackpackSatchelVirology: 2
     ClothingBackpackDuffelVirology: 2
     ClothingShoesBootsWinterViro: 2 #Delta V: Add departmental winter boots
+#LPP
+    LPPGorkaVirology: 2
+    LPPGorkaVirologyVarg: 2
+    LPPQmcVirology: 2
+    LPPQmcSyndVirology: 2
+    LPPSkirtleneck: 2
+    LPPSkirtleneck2: 2
+    LPPSkirtleneckQM: 2
+    LPPSkirtleneckQM2: 2
+    LPPSupplyChief: 2
+    LPPSupplyChief2: 2
+    LPPSupplyChiefSkirt: 2
+    LPPSupplyChiefSkirt2: 2
+    LPPTurtleneckQM: 2
+    LPPTurtleneckQM2: 2
+    LPPUtilVirology: 2
+    LPPVirologyBlackSkirt: 2
+    LPPVirologyTechjean: 2
+    LPPMedicBlackSkirt2: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
@@ -18,7 +18,16 @@
     ClothingOuterCoatBomber: 3
     ClothingHeadHatSantahat: 2
     ClothingHeadHatXmasCrown: 2
-
+#LPP
+    LPPClothingHeadHatBlackBeanie: 2
+    LPPClothingHeadHatBlueBeanie: 2
+    LPPClothingHeadHatGreenBeanie: 2
+    LPPClothingHeadHatRedBeanie: 2
+    LPPClothingOuterCoatBomber1: 3
+    LPPClothingOuterCoatBomber2: 3
+    LPPClothingOuterCoatBomber3: 3
+    LPPClothingOuterCoatBomber4: 3
+    LPPClothingOuterCoatBomber5: 3
   emaggedInventory:
     ClothingNeckScarfStripedSyndieGreen: 3
     ClothingNeckScarfStripedSyndieRed: 3

diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml
@@ -4,6 +4,9 @@
   description: job-description-mail-carrier
   startingGear: CourierGear
   playTimeTracker: JobMailCarrier
+  requirements:
+    - !type:CharacterOverallTimeRequirement
+      min: 3600 # LostParadise - 1 hour
   icon: "JobIconMailCarrier"
   supervisors: job-supervisors-qm
   access:

diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
@@ -6,7 +6,7 @@
   antagAdvantage: 2 # DeltaV - Reduced TC: External Access
   requirements:
     - !type:CharacterOverallTimeRequirement
-      min: 7200
+      min: 1800 # LostParadise - 30 min
   startingGear: CargoTechGear
   icon: "JobIconCargoTechnician"
   supervisors: job-supervisors-qm

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml
@@ -3,6 +3,9 @@
   name: job-name-botanist
   description: job-description-botanist
   playTimeTracker: JobBotanist
+  requirements:
+    - !type:CharacterOverallTimeRequirement
+      min: 1800 # LostParadise - 30 min
   startingGear: BotanistGear
   icon: "JobIconBotanist"
   supervisors: job-supervisors-hop