Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Фикс меты и изменения каталога #72

Merged
merged 1 commit into from
Sep 6, 2024
Merged

Фикс меты и изменения каталога #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Crates/security.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
prob: 0.3
- id: ClothingMaskSterile
- id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes!
prob: 0.3
prob: 0.3

- type: entity
parent: LockerWallMedical
Expand Down Expand Up @@ -145,7 +145,7 @@
orGroup: Surgshrubs
- id: ClothingMaskSterile
- id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes!
prob: 0.3
prob: 0.3

- type: entity
id: LockerChemistryFilled
Expand Down Expand Up @@ -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
Expand All @@ -196,7 +196,7 @@
components:
- type: StorageFill
contents:
- id: ClothingOuterHardsuitVoidParamed
- id: LPPHardsuitAssaultParamedic #LPP
- id: ClothingOuterCoatParamedicWB
- id: ClothingHeadHatParamedicsoft
- id: ClothingOuterWinterPara
Expand All @@ -211,4 +211,4 @@
- id: MedkitFilled
prob: 0.3
- id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes!
prob: 0.3
prob: 0.3
19 changes: 19 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/security.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -197,6 +214,8 @@
- id: BoxEvidenceMarkers
- id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
prob: 0.3
#LPP
- id: LPPClothingOuterDetectiveHardsuit

- type: entity
id: ClosetBombFilled
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@
contents:
- id: NitrogenTankFilled
- id: OxygenTankFilled
- id: ClothingOuterHardsuitVoidParamed
- id: LPPHardsuitAssaultParamedic #Изменение от LPP
- id: ClothingMaskBreathMedical
- type: AccessReader
access: [ [ "Paramedic" ] ]
Expand Down
13 changes: 13 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
50 changes: 50 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 14 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
15 changes: 14 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,8 @@
SeismicCharge: 2
FultonBeacon: 1
Fulton: 2
#LPP
WeaponCrusherDagger: 2
ContrabandInventory:
LPPWeaponSyndieGlaive: 1
ClothingBackpackDuffelSyndicate: 1
21 changes: 21 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@
FoodDonutHomer: 12
FoodBoxDonut: 2
#box evidence
LPPTelebaton: 3 #LPP
27 changes: 26 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
19 changes: 19 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/virodrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 10 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
36 changes: 28 additions & 8 deletions Resources/Textures/Structures/cryostorage.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,31 @@
"name": "sleeper_1",
"directions": 4,
"delays": [
[1.5, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05],
[1.5, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05],
[1.5, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05],
[1.5, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05]
]
}
]
}
[
0.2,
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2,
0.2
]
]
}
]
}
Loading
Loading