diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml index eae2d09463..4b9a1c1e38 100644 --- 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 index 592c153508..01267e06cd 100644 --- 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 index f217791683..9e28863b62 100644 --- 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 index e2d7ad1483..8931db3869 100644 --- 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 index 734bd485a2..c22577f748 100644 --- 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 index f2cc7e8a54..dfabbc8cf7 100644 --- 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 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml index 433210dce7..524d963557 100644 --- 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 \ No newline at end of file + # End of modified code + LPPChemistHudGlasses: 2 #LPP-Edit's \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 6c99f925ee..a6e9e02f44 100644 --- 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 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml index 5d732def49..82d7eb19c3 100644 --- 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 index f4fb03e6c7..294a7b2c98 100644 --- 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 index b5665df37b..609c41107c 100644 --- 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 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml index c4608af34e..924c3f734e 100644 --- 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 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index 01b58ae40f..e3148f2572 100644 --- 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 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index cb0c10c129..d36098022d 100644 --- 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 \ No newline at end of file + 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 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/virodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/virodrobe.yml index a5965ad4de..630e4beb10 100644 --- 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 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml index 0f8c73dac3..09ad00f016 100644 --- 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 index 58613660b2..a89186f043 100644 --- 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 index 5eb8c61f03..816478055c 100644 --- 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 index fd6e9442c6..693b2d3272 100644 --- 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 diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml index ce217c942b..f8fa97bcab 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml @@ -5,7 +5,7 @@ playTimeTracker: JobClown requirements: - !type:CharacterOverallTimeRequirement # DeltaV - Playtime requirement - min: 7200 #2 hrs + min: 14400 # LostParadise - 4 hours startingGear: ClownGear icon: "JobIconClown" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml index 4db2ce81b8..1b01824c77 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml @@ -3,6 +3,9 @@ name: job-name-janitor description: job-description-janitor playTimeTracker: JobJanitor + requirements: + - !type:CharacterOverallTimeRequirement + min: 1800 # LostParadise - 30 min startingGear: JanitorGear icon: "JobIconJanitor" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml index 403f05dc51..ee745b2d22 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml @@ -5,7 +5,7 @@ playTimeTracker: JobServiceWorker requirements: - !type:CharacterOverallTimeRequirement - min: 7200 # DeltaV - 2 hours + min: 1800 # LostParadise - 30 min startingGear: ServiceWorkerGear icon: "JobIconServiceWorker" supervisors: job-supervisors-service diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml index 3c13fbd7bd..6b03fa81a7 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -6,7 +6,7 @@ antagAdvantage: 3 # DeltaV - Reduced TC: External Access + Engineering requirements: - !type:CharacterOverallTimeRequirement # DeltaV - to prevent griefers from taking the role. - min: 14400 # 4 hours + min: 1800 # LostParadise - 30 min # - !type:DepartmentTimeRequirement # Lost Paradise - return time limit # department: Engineering # time: 54000 #15 hrs diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml index 197542acf3..12818a4284 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -5,7 +5,7 @@ playTimeTracker: JobMedicalIntern requirements: - !type:CharacterOverallTimeRequirement - min: 7200 + min: 1800 # LostParadise - 30 min # - !type:DepartmentTimeRequirement # Lost Paradise - return time limit # department: Medical # time: 54000 # 15 hrs diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml index c87f00cbd6..13daf550ba 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml @@ -5,7 +5,7 @@ playTimeTracker: JobResearchAssistant requirements: - !type:CharacterOverallTimeRequirement - min: 7200 + min: 1800 # LostParadise - 30 min # - !type:DepartmentTimeRequirement # Lost Paradise - return time limit # department: Science # time: 54000 #15 hrs diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml index d3a6b834b8..35f0808dfe 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml @@ -357,4 +357,9 @@ Blunt: 0.95 Slash: 0.95 Piercing: 0.95 - Heat: 0.95 \ No newline at end of file + Heat: 0.95 + - type: Tag + tags: + - HidesHair + - WhitelistChameleon + - HidesNose \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml b/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml index 071969c22b..2787c95c30 100644 --- a/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml +++ b/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml @@ -1,62 +1,48 @@  -# Управление + # Управление -Вы можете в любой момент изменить привязки клавиш здесь: - + Здесь вы можете изменить сочетания клавиш в любое время: + -## Перемещение -Вы можете перемещаться по игровому миру с помощью [color=yellow][bold][keybind="MoveUp"][keybind="MoveLeft"][keybind="MoveDown"][keybind="MoveRight"][/bold][/color]. -Если удерживать [color=yellow][bold][keybind="Walk"][/bold][/color], вы будете ходить шагом, что не даст вам поскользнуться и упасть. + ## Базовое управление + Мы будем вежливо предполагать, что вы уже знаете, как работает WASD. + Помимо этого, в SS14 есть несколько основных взаимодействий, упорядоченных по важности: -Вы можете включить ходьбу на [color=cyan]переключение[/color] в меню управления. + - [color=#a4885c][keybind="Use"/][/color] чтобы подобрать предметы и использовать объекты как кнопки или компьютеры, и [color=#a4885c][keybind="ActivateItemInWorld"/][/color] использовать предметы. Вы так же можете нажать [color=#a4885c]alt[/color] делая это, чтобы вызвать альтернативные взаимодействия для некоторых объектов. + - Вы также можете быстро использовать предметы, которые держите в руках, нажав [color=#a4885c][keybind="ActivateItemInHand"/][/color] и [color=#a4885c][keybind="AltActivateItemInHand"/][/color] соответственно. + - [color=#a4885c][keybind="UIRightClick"/][/color] чтобы открыть контекст меню. Затем вы можете либо щелкнуть левой кнопкой мыши по записи, как в обычном режиме, либо щелкнуть правой кнопкой мыши еще раз, чтобы открыть меню глаголов, которое предоставляет вам более сложные способы взаимодействия с объектом. + - Вы можете нажать [color=#a4885c][keybind="ExamineEntity"/][/color] на объекты чтобы осмотреть их, чтобы узнать их название и детализацию (хотя часто и с чувством юмора) описание. -[color=cyan]Перетаскивание[/color] объектов осуществляется с помощью [color=yellow][bold][keybind="TryPullObject"][/bold][/color]. -Во время перетаскивания вы можете перетащить объект к курсору мыши с помощью [color=yellow][bold][keybind="MovePulledObject"][/bold][/color]. -Нажав [color=yellow][bold][keybind="ReleasePulledObject"][/bold][/color], вы отпустите объект, который вы в данный момент перетаскиваете. + Вы можете быстро опробовать эти элементы управления с помощью обезьянки, изображенной ниже (заметка: нажатие на нее работает только в игре, а не в лобби), и в любом месте этого руководства, если вам будет показан объект, [color=#a4885c][keybind="ExamineEntity"/] осмотр будет работать всегда[/color]: -Вы можете оказаться в ситуации с [color=#EB2D3A][bold]низкой гравитацией[/bold][/color]. -Это приведёт к тому, что ваш персонаж будет дрейфовать при движении. -Находясь вне станции, вы не сможете контролировать своё направление. -[bold]Бросание предметов[/bold] или [bold]распыление огнетушителя[/bold] помогут вам двигаться, находясь в таком состоянии. -## Взаимодействие -Общие взаимодействия осуществляются с помощью [color=yellow][bold][keybind="Use"][/bold][/color]. -Они [bold]контекстно-зависимые[/bold] и зависят от предмета в вашей активной руке. -Вы также можете использовать [color=yellow][bold][keybind="AltActivateItemInWorld"][/bold][/color] для выполнения [bold]альтернативных взаимодействий[/bold]. + -Для выполнения [color=cyan]базовых взаимодействий[/color] используйте [color=yellow][bold][keybind="ActivateItemInWorld"][/bold][/color]. -Это похоже на [bold]взаимодействие, когда в руках ничего нет[/bold]. -Нажатие [color=yellow][bold][keybind="ActivateItemInHand"][/bold][/color] приводит к тому же эффекту с текущим удерживаемым предметом. -Это наиболее часто используется для выполнения основных действий, когда вы держите что-то в руках, например, для открытия двери, когда у вас заняты руки. + ## Инвентарь + Чтобы перемещать предметы в вашем инвентаре и между контейнерами, вы можете щелкнуть по предмету (или его названию), чтобы переместить его в свою активную руку, а затем щелкнуть по месту, куда вы хотите его переместить (либо в ячейку на вашем HUD, либо в контейнер). -Наведение курсора на объект и нажатие [color=yellow][bold][keybind="UIRightClick"/][/bold][/color] вызывает [color=cyan]контекстное меню[/color]. -Это позволяет не только сортировать большие кучи предметов, но и выполнять [bold]дополнительные действия[/bold]. + Предметы, находящиеся у вас в руках, активны только по одному за раз, чтобы переключиться между теми, которые вы используете в данный момент, вы можете нажать [color=#a4885c][keybind="SwapHands"/][/color] на вашей клавиатуре чтобы сменить активную руку. -[color=cyan]Изучение[/color] предметов осуществляется с помощью [color=yellow][bold][keybind="ExamineEntity"][/bold][/color], которая вызывает окно с названием объекта, небольшим описанием и другими важными деталями. -[italic]Изучение окружающих предметов поможет вам узнать, что они делают и какими свойствами обладают[/italic]. + Открывать контейнеры в вашем инвентаре также просто: наведите курсор на нужный предмет и активируйте его с помощью [color=#a4885c][keybind="ActivateItemInWorld"/][/color] или нажмите на значок сумки в правом нижнем углу слота, в котором она находится. -## Руки -Используя [color=yellow][bold][keybind="Use"][/bold][/color] на предметах в мире, вы подберёте их в вашу активную руку. -Вы можете менять активную руку, используя [color=yellow][bold][keybind="SwapHands"][/bold][/color]. + Когда вы открываете контейнер, появляется окно, в котором отображается содержимое контейнера и количество свободного места для хранения вещей. + Все предметы имеют определенный размер, некоторые из них слишком велики, чтобы поместиться в большинстве или во всех контейнерах. -Вы можете [color=cyan]положить[/color] предмет, который держите в руках, используя [color=yellow][bold][keybind="Drop"][/bold][/color] или [color=cyan]бросить его[/color] к вашему курсору с помощью [color=yellow][bold][keybind="ThrowItemInHand"][/bold][/color]. + Чтобы бросить предмет вы можете нажать [color=#a4885c][keybind="Drop"/][/color], и отбросить их с большей силой (так же известное как бросок), вы можете нажать [color=#a4885c][keybind="ThrowItemInHand"/][/color]. -## Инвентарь -Вы можете [color=cyan]открыть[/color] свой инвентарь, используя [color=yellow][bold][keybind="OpenInventoryMenu"][/bold][/color]. -Каждый слот в вашем HUD может быть заполнен соответствующим [bold]предметом[/bold] или [bold]одеждой[/bold]. + Немного более продвинутым способом управления вашим инвентарем является использование [color=#a4885c]Shift + B[/color]. Если ваша активная рука в данный момент пуста, эта горячая клавиша вытащит последний предмет, который был положен в вашу сумку. Если у вас в руке есть какой-либо предмет, эта же горячая клавиша положит его в вашу сумку. + Горячая клавиша [color=#a4885c]Shift + E[/color] работает точно так же, но использует ваш ремень в качестве хранилища. + ## Действия + Слева на вашем графическом дисплее есть панель, показывающая различные действия, которые вы можете предпринять. + Вы можете навести курсор на каждое из них, чтобы увидеть название и описание действия, которые расскажут вам, что это такое и как оно работает. + Вы можете щелкнуть по действию, чтобы вызвать его, или нажать цифровую клавишу в любой момент, чтобы вызвать действие, не нажимая на него. -Два слота на нижней панели соответствуют вашим [bold]сумке и поясу[/bold]. -Вы можете открыть их, нажав [color=yellow][bold][keybind="ActivateItemInWorld"][/bold][/color] по ним или кликнув на иконку в [bold]правом нижнем углу[/bold]. + Чтобы изменить порядок ваших действий, просто перетащите их в другие ячейки, щелкните правой кнопкой мыши, чтобы удалить их, и нажмите на значок шестеренки в верхней части панели, чтобы открыть меню для (повторного) их добавления. + Всего у вас есть 10 страниц с действиями, между которыми вы можете переключаться нажатием кнопки [color=#a4885c]shift-(number)[/color]. + Кроме того, вы можете нажать на значок блокировки, чтобы предотвратить изменение панели действий. -Нажатие [color=yellow][bold][keybind="MoveStoredItem"][/bold][/color] позволит [color=cyan]достать предмет из сумки[/color]. -Удерживая её, вы сможете [color=cyan]перетащить[/color] предмет в другое место. -При перетаскивании нажатие [color=yellow][bold][keybind="RotateStoredItem"][/bold][/color] приведёт к [color=cyan]вращению[/color] предмета. - -Вы по-прежнему можете выполнять все обычные действия с предметами в сумке, включая [color=cyan]осмотр[/color] и открытие [color=cyan]контекстного меню[/color]. - -## Камера -Камеру можно [color=cyan]масштабировать[/color] с помощью [color=yellow][bold][keybind="ZoomIn"][/bold][/color] и [color=yellow][bold][keybind="ZoomOut"][/bold][/color] и сбрасывать с помощью [color=yellow][bold][keybind="ResetZoom"][/bold][/color]. -Аналогично, вы можете [color=cyan]вращать[/color] её влево и вправо с помощью [color=yellow][bold][keybind="CameraRotateLeft"][/bold][/color] и [color=yellow][bold][keybind="CameraRotateRight"][/bold][/color]. -Вы можете выровнять её в соответствии с поворотом грида с помощью [color=yellow][bold][keybind="CameraReset"][/bold][/color]. + ## Передвижение + Есть несколько факторов, которые могут повлиять на ваши движения, в первую очередь это касается скольжения (для этого вам нужно ходить с [color=#a4885c]shift[/color] чтобы избежать, обычно.) и отсутствие гравитации. + Скольжение просто оглушает вас на некоторое время, но никакая гравитация не может быть смертельной, если вы сойдете с дистанции и отойдете более чем на 1,5 м от ближайшей стены или твердой конструкции, так как вы потеряете хватку и больше не сможете двигаться, не кинув что-нибудь. diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_chemistry.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_chemistry.png index 2d1c1e7740..a9273418d9 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_chemistry.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_chemistry.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/alex.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hats/alex.rsi/meta.json index a4d090165b..69b8f9a187 100644 --- a/Resources/Textures/_LostParadise/Clothing/Head/Hats/alex.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/Head/Hats/alex.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", - "copyright": "Made by Qwerlink(discord dago#7393) for SS220", + "license": "CC-BY-SA-3.0", + "copyright": "Made by Qwerlink(discord dago#7393) for SS220 https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/jake.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hats/jake.rsi/meta.json index a4d090165b..69b8f9a187 100644 --- a/Resources/Textures/_LostParadise/Clothing/Head/Hats/jake.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/Head/Hats/jake.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", - "copyright": "Made by Qwerlink(discord dago#7393) for SS220", + "license": "CC-BY-SA-3.0", + "copyright": "Made by Qwerlink(discord dago#7393) for SS220 https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/rasmus.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hats/rasmus.rsi/meta.json index a4d090165b..69b8f9a187 100644 --- a/Resources/Textures/_LostParadise/Clothing/Head/Hats/rasmus.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/Head/Hats/rasmus.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", - "copyright": "Made by Qwerlink(discord dago#7393) for SS220", + "license": "CC-BY-SA-3.0", + "copyright": "Made by Qwerlink(discord dago#7393) for SS220 https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/richter.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hats/richter.rsi/meta.json index a4d090165b..69b8f9a187 100644 --- a/Resources/Textures/_LostParadise/Clothing/Head/Hats/richter.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/Head/Hats/richter.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", - "copyright": "Made by Qwerlink(discord dago#7393) for SS220", + "license": "CC-BY-SA-3.0", + "copyright": "Made by Qwerlink(discord dago#7393) for SS220 https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/tony.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hats/tony.rsi/meta.json index a4d090165b..69b8f9a187 100644 --- a/Resources/Textures/_LostParadise/Clothing/Head/Hats/tony.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/Head/Hats/tony.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", - "copyright": "Made by Qwerlink(discord dago#7393) for SS220", + "license": "CC-BY-SA-3.0", + "copyright": "Made by Qwerlink(discord dago#7393) for SS220 https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/upgcloth.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/upgcloth.rsi/equipped-INNERCLOTHING.png index f8271d04ba..e8fa270393 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/upgcloth.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/upgcloth.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/upgcloth.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/upgcloth.rsi/icon.png index d197f409f8..bd607df34e 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/upgcloth.rsi/icon.png and b/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/upgcloth.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/base.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/base.png deleted file mode 100644 index 076dda39e2..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/equipped-INNERCLOTHING.png deleted file mode 100644 index 3fef984aca..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/equipped-INNERCLOTHING.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/icon.png deleted file mode 100644 index 623d85a9e1..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/visor.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/visor.png deleted file mode 100644 index 681abfadf8..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/visor.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/base.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/base.png deleted file mode 100644 index 076dda39e2..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/equipped-INNERCLOTHING.png deleted file mode 100644 index 3fef984aca..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/equipped-INNERCLOTHING.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/icon.png deleted file mode 100644 index 623d85a9e1..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/visor.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/visor.png deleted file mode 100644 index 681abfadf8..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/visor.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Decals/bricktile-s.rsi/meta.json b/Resources/Textures/_LostParadise/Decals/bricktile-s.rsi/meta.json index 2658bbe3b3..166cddf8e3 100644 --- a/Resources/Textures/_LostParadise/Decals/bricktile-s.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Decals/bricktile-s.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC0-1.0", + "license": "CC-BY-SA-3.0", "copyright": "Made by github user @Morb0. Modified v2 by ko4erga (discord)", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Decals/departament-sign.rsi/meta.json b/Resources/Textures/_LostParadise/Decals/departament-sign.rsi/meta.json index 91ca171029..fb92ddd8a2 100644 --- a/Resources/Textures/_LostParadise/Decals/departament-sign.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Decals/departament-sign.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 2, - "license": "AGPL 3.0", + "license": "CC-BY-SA-3.0", "copyright": "Draw by Hqlle (Github)", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Decals/ind-letters-mini.rsi/meta.json b/Resources/Textures/_LostParadise/Decals/ind-letters-mini.rsi/meta.json index 35a2719d5d..964518168b 100644 --- a/Resources/Textures/_LostParadise/Decals/ind-letters-mini.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Decals/ind-letters-mini.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 2, - "license": "AGPL 3.0", + "license": "CC-BY-SA-3.0", "copyright": "Draw by Hqlle (Github)", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Decals/ind-letters.rsi/meta.json b/Resources/Textures/_LostParadise/Decals/ind-letters.rsi/meta.json index 20d10d0625..4eee2f7b0c 100644 --- a/Resources/Textures/_LostParadise/Decals/ind-letters.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Decals/ind-letters.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 2, - "license": "AGPL 3.0", + "license": "CC-BY-SA-3.0", "copyright": "Draw by Hqlle (Github)", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Decals/ind-numbers-mini.rsi/meta.json b/Resources/Textures/_LostParadise/Decals/ind-numbers-mini.rsi/meta.json index a398d3a506..410d63e12f 100644 --- a/Resources/Textures/_LostParadise/Decals/ind-numbers-mini.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Decals/ind-numbers-mini.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 2, - "license": "AGPL 3.0", + "license": "CC-BY-SA-3.0", "copyright": "Draw by Hqlle (Github)", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Decals/ind-numbers.rsi/meta.json b/Resources/Textures/_LostParadise/Decals/ind-numbers.rsi/meta.json index a398d3a506..410d63e12f 100644 --- a/Resources/Textures/_LostParadise/Decals/ind-numbers.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Decals/ind-numbers.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 2, - "license": "AGPL 3.0", + "license": "CC-BY-SA-3.0", "copyright": "Draw by Hqlle (Github)", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Decals/lpsignwtext.rsi/meta.json b/Resources/Textures/_LostParadise/Decals/lpsignwtext.rsi/meta.json index df86372cb8..2d4fd74fa6 100644 --- a/Resources/Textures/_LostParadise/Decals/lpsignwtext.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Decals/lpsignwtext.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 2, - "license": "AGPL 3.0", + "license": "CC-BY-SA-3.0", "copyright": "Draw by Hqlle (Github)", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Decals/markup.rsi/meta.json b/Resources/Textures/_LostParadise/Decals/markup.rsi/meta.json index e19ff7cfcf..42f1934fdb 100644 --- a/Resources/Textures/_LostParadise/Decals/markup.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Decals/markup.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 2, - "license": "AGPL 3.0", + "license": "CC-BY-SA-3.0", "copyright": "Draw by Hqlle (Github)", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Decals/minitile-s.rsi/meta.json b/Resources/Textures/_LostParadise/Decals/minitile-s.rsi/meta.json index 50fc352e23..18cd972a15 100644 --- a/Resources/Textures/_LostParadise/Decals/minitile-s.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Decals/minitile-s.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC0-1.0", + "license": "CC-BY-SA-3.0", "copyright": "Made by github user Skilets", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Decals/secsign.rsi/meta.json b/Resources/Textures/_LostParadise/Decals/secsign.rsi/meta.json index dcccb470e3..a18ae275f7 100644 --- a/Resources/Textures/_LostParadise/Decals/secsign.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Decals/secsign.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 2, - "license": "AGPL 3.0", + "license": "CC-BY-SA-3.0", "copyright": "Draw by Hqlle (Github)", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Decals/starcircle.rsi/meta.json b/Resources/Textures/_LostParadise/Decals/starcircle.rsi/meta.json index 63fc41ae4c..c5f380b99a 100644 --- a/Resources/Textures/_LostParadise/Decals/starcircle.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Decals/starcircle.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 2, - "license": "AGPL 3.0", + "license": "CC-BY-SA-3.0", "copyright": "Draw by Hqlle (Github)", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Decals/wheelchair.rsi/meta.json b/Resources/Textures/_LostParadise/Decals/wheelchair.rsi/meta.json index 331e12ade9..6fc2b02f07 100644 --- a/Resources/Textures/_LostParadise/Decals/wheelchair.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Decals/wheelchair.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 2, - "license": "CC-BY-NC-SA-4.0", + "license": "CC-BY-SA-3.0", "copyright": "Draw by Skilets: https://github.com/Skilets", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Objects/Fun/daki.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Fun/daki.rsi/meta.json index 925163054c..1dbd262fee 100644 --- a/Resources/Textures/_LostParadise/Objects/Fun/daki.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Objects/Fun/daki.rsi/meta.json @@ -1,5 +1,6 @@ { "version": 1, + "license": "CC-BY-SA-3.0", "copyright": "Taken from BlueMoon github https://github.com/BlueMoon-Labs/SERP-BlueMoon-Station-13", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Objects/Misc/specialdelivery.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Misc/specialdelivery.rsi/meta.json index d5bcc17c0a..9e64816e71 100644 --- a/Resources/Textures/_LostParadise/Objects/Misc/specialdelivery.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Objects/Misc/specialdelivery.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", - "copyright": "Made by Qwerlink(discord dago#7393) for SS220", + "license": "CC-BY-SA-3.0", + "copyright": "Made by Qwerlink(discord dago#7393) for SS220 https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/telebaton.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/telebaton.rsi/meta.json index b44223a9e8..fdb6fcd2d6 100644 --- a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/telebaton.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/telebaton.rsi/meta.json @@ -1,6 +1,6 @@ { - "version": 1.3, - "license": "CC-BY-3.0", + "version": 1, + "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/555fa0ed9f380509156d94131bd8a3f1c1fee1cf", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/telebatonSpac.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/telebatonSpac.rsi/meta.json index b44223a9e8..fdb6fcd2d6 100644 --- a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/telebatonSpac.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/telebatonSpac.rsi/meta.json @@ -1,6 +1,6 @@ { - "version": 1.3, - "license": "CC-BY-3.0", + "version": 1, + "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/555fa0ed9f380509156d94131bd8a3f1c1fee1cf", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/cartridge.png b/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/cartridge.png deleted file mode 100644 index bf32beff2e..0000000000 Binary files a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/cartridge.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/full.png b/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/full.png deleted file mode 100644 index 3fff4ea173..0000000000 Binary files a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/full.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/high.png b/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/high.png deleted file mode 100644 index 375fdfd8ba..0000000000 Binary files a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/high.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/icon.png b/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/icon.png deleted file mode 100644 index 7401ef8554..0000000000 Binary files a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/inhand-left.png deleted file mode 100644 index 89f5e98c03..0000000000 Binary files a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/inhand-right.png deleted file mode 100644 index bfa6b35c3d..0000000000 Binary files a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/low.png b/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/low.png deleted file mode 100644 index 1d56e83adc..0000000000 Binary files a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/low.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/medium.png b/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/medium.png deleted file mode 100644 index d7cefcb12e..0000000000 Binary files a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/medium.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/meta.json b/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/meta.json deleted file mode 100644 index e79a8183d5..0000000000 --- a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/meta.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "version": 1, - "license": "See repo license.", - "copyright": "By temporaldarkness for Enterprise server exclusive use.", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "working", - "delays": [ - [ - 0.2, - 0.15, - 0.2, - 0.15 - ] - ] - }, - { - "name": "slotted", - "delays": [ - [ - 0.25, - 0.25, - 0.25, - 0.25 - ] - ] - }, - { - "name": "none", - "delays": [ - [ - 0.25, - 0.25, - 0.25, - 0.25 - ] - ] - }, - { - "name": "low", - "delays": [ - [ - 0.25, - 0.25, - 0.25, - 0.25 - ] - ] - }, - { - "name": "medium", - "delays": [ - [ - 0.25, - 0.25, - 0.25, - 0.25 - ] - ] - }, - { - "name": "high", - "delays": [ - [ - 0.25, - 0.25, - 0.25, - 0.25 - ] - ] - }, - { - "name": "full", - "delays": [ - [ - 0.25, - 0.25, - 0.25, - 0.25 - ] - ] - }, - { - "name": "cartridge" - }, - { - "name": "inhand-left" - }, - { - "name": "inhand-right" - } - ] -} diff --git a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/none.png b/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/none.png deleted file mode 100644 index 1b62925312..0000000000 Binary files a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/none.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/slotted.png b/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/slotted.png deleted file mode 100644 index f1fa6b5b65..0000000000 Binary files a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/slotted.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/working.png b/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/working.png deleted file mode 100644 index 92b974cd93..0000000000 Binary files a/Resources/Textures/_LostParadise/Structures/Machines/book_printer.rsi/working.png and /dev/null differ