diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 29234ea34c..5d9b57bfe4 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -540,7 +540,7 @@ tags: - Trash - CannotSuicide - - DoorBumpOpener # DeltaV - After all, why not? Why shouldn't they be able to open doors? + # - DoorBumpOpener # DeltaV - After all, why not? Why shouldn't they be able to open doors? - VimPilot - type: CanEscapeInventory - type: NpcFactionMember diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 6f02b9bafc..03b97671b2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -1041,134 +1041,3 @@ Heat: 20 # Slightly more damage than the 17heat from the Captain's Hitscan lasgun soundHit: collection: MeatLaserImpact - -#---------------------LPP-------------------------- - -- type: entity - id: BulletCutter - name: Cutter bolt - parent: BaseBullet - nospawn: true - description: Not too bad, but you still don't want to get hit by it. - components: - - type: Reflective - reflective: - - NonEnergy - - type: Sprite - noRot: false - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - layers: - - state: scatterlaser - shader: unshaded - - type: GatheringProjectile - - type: Projectile - DeleteOnCollide: false - damage: - types: - Blunt: 0.5 - # Короткий срок пули - - type: TimedDespawn - lifetime: 0.2 - -- type: entity - name : Cutter bolt - id: BulletCutter2 - parent: BaseBullet - nospawn: true - components: - - type: Reflective - reflective: - - Energy - - type: FlyBySound - sound: - collection: EnergyMiss - params: - volume: 5 - - type: Sprite - noRot: false - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - layers: - - state: scatterlaser - shader: unshaded - - type: Physics - - type: Fixtures - fixtures: - projectile: - shape: - !type:PhysShapeAabb - bounds: "-0.15,-0.3,0.15,0.3" - hard: false - mask: - - Impassable - - BulletImpassable - fly-by: *flybyfixture - - type: Ammo - - type: StaminaDamageOnCollide - damage: 13 - - type: Projectile - impactEffect: BulletImpactEffectDisabler - DeleteOnCollide: false - damage: - types: - Heat: 5 - Slash: 9 - soundHit: - path: "/Audio/LPP/Weapons/Guns/Gunshots/ion/ion_hit_1.ogg" - soundForce: true - - type: TimedDespawn - lifetime: 0.4 - - type: GatheringProjectile - -- type: entity - name : battlecutter1 - id: battlecuttershot - parent: BaseBullet - nospawn: true - components: - - type: Reflective - reflective: - - Energy - - type: FlyBySound - sound: - collection: EnergyMiss - params: - volume: 5 - - type: Sprite - sprite: _LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi - layers: - - state: ion - shader: unshaded - - type: Physics - - type: Fixtures - fixtures: - projectile: - shape: - !type:PhysShapeAabb - bounds: "-0.15,-0.3,0.15,0.3" - hard: false - mask: - - Impassable - - BulletImpassable - fly-by: *flybyfixture - - type: Ammo - - type: Projectile - impactEffect: BulletImpactEffectDisabler - damage: - types: - Blunt: 5 - Slash: 10 - -- type: hitscan - id: RedAILaser - damage: - types: - Heat: 1 - muzzleFlash: - sprite: _LostParadise/Objects/Weapons/Guns/projectiles/ailaser.rsi - state: AILaser_3 - travelFlash: - sprite: _LostParadise/Objects/Weapons/Guns/projectiles/ailaser.rsi - state: AILaser_2 - impactFlash: - sprite: _LostParadise/Objects/Weapons/Guns/projectiles/ailaser.rsi - state: AILaser_1 diff --git a/Resources/Prototypes/_LostParadise/Catalog/Fills/Lockers/science.yml b/Resources/Prototypes/_LostParadise/Catalog/Fills/Lockers/science.yml index f12277f6c6..a21a7dfd5e 100644 --- a/Resources/Prototypes/_LostParadise/Catalog/Fills/Lockers/science.yml +++ b/Resources/Prototypes/_LostParadise/Catalog/Fills/Lockers/science.yml @@ -1,20 +1,20 @@ -# - type: entity -# id: LockerExpeditorFilled -# suffix: Expeditor, Filled -# parent: LockerExpeditor -# components: -# - type: StorageFill -# contents: -# - id: LPPGatewayGun -# - id: ClothingHeadsetScience -# - id: LPPClothingUniformJumpsuitExpeditor -# - id: ClothingHandsGlovesCombat -# - id: MedkitFilled -# amount: 2 -# - id: WeaponCrusher -# - id: LPPExpeditorCoat -# - id: BoxMRE -# amount: 2 -# - id: OreBag -# - id: RadioHandheld -# - id: ClothingBeltUtilityFilled +- type: entity + id: LockerExpeditorFilled + suffix: Expeditor, Filled + parent: LockerExpeditor + components: + - type: StorageFill + contents: + - id: LPPGatewayGun + - id: ClothingHeadsetScience + - id: LPPClothingUniformJumpsuitExpeditor + - id: ClothingHandsGlovesCombat + - id: MedkitFilled + amount: 2 + - id: WeaponCrusher + - id: LPPExpeditorCoat + - id: BoxMRE + amount: 2 + - id: OreBag + - id: RadioHandheld + - id: ClothingBeltUtilityFilled diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/base_lpp_backpack.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/base_lpp_backpack.yml index 3a72d28feb..38e7d5af7e 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/base_lpp_backpack.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/base_lpp_backpack.yml @@ -9,7 +9,6 @@ tags: [] # ignore "WhitelistChameleon" tag - type: Storage maxItemSize: Large - maxTotalWeight: 14 - type: Sprite sprite: Clothing/Back/Satchels/satchel.rsi visible: false diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/satchel.yml index 3fbba8762a..c87413bcd4 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/satchel.yml @@ -18,7 +18,7 @@ layers: - state: icon - type: Construction - graph: smugglersbag + graph: SmugglersBag node: smugglersbag - type: entity diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/BlueShieldGasMask.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/BlueShieldGasMask.yml index 6eb3abcfd5..47da5c2109 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/BlueShieldGasMask.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/BlueShieldGasMask.yml @@ -8,7 +8,6 @@ sprite: _LostParadise/Clothing/Mask/BlueShieldGasMask.rsi - type: Clothing sprite: _LostParadise/Clothing/Mask/BlueShieldGasMask.rsi - hideOnToggle: true - type: Armor modifiers: coefficients: diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/food/burger.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/food/burger.yml index 0b2dfb080c..f087d7d926 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/food/burger.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/food/burger.yml @@ -19,13 +19,13 @@ Quantity: 5 - ReagentId: Vitamin Quantity: 5 - metabolisms: - Medicine: - effects: - - !type:HealthChange - damage: - groups: - Piercing: -2 + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + groups: + Piercing: -2 - type: Tag tags: - Meat diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/food/gingerbread.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/food/gingerbread.yml index 2d7f3ff90f..06f6d34cd2 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/food/gingerbread.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/food/gingerbread.yml @@ -20,13 +20,13 @@ Quantity: 15 - ReagentId: Vitamin Quantity: 5 - metabolisms: - Medicine: - effects: - - !type:HealthChange - damage: - groups: - Blunt: -2 + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + groups: + Blunt: -2 - type: entity name: пвяник @@ -50,11 +50,11 @@ Quantity: 228 - ReagentId: Vitamin Quantity: 1337 - metabolisms: - Medicine: - effects: - - !type:HealthChange - damage: - groups: - Radiaton: -20 - Cell: -20 \ No newline at end of file + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + groups: + Radiaton: -20 + Cell: -20 diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/CrateVintageDemocracy.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/CrateVintageDemocracy.yml index 6c593b3ece..4ac57ae3fa 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/CrateVintageDemocracy.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/CrateVintageDemocracy.yml @@ -31,4 +31,3 @@ - id: ClothingHandsMercGlovesCombat - id: LPPClothingHeadHatTacticalHelmetWrittenOff - id: LPPClothingNeckChain - - id: LPPCamogreen diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/RingStorage.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/RingStorage.yml index 79eb728a43..48011b7071 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/RingStorage.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/RingStorage.yml @@ -25,8 +25,11 @@ - id: ClothingHandsRingTurk amount: 1 - type: Appearance + - type: GenericVisualizer visuals: - - type: BagOpenCloseVisualizer - openIcon: box-open + enum.ToggleVisuals.Toggled: + enum.ToggleVisuals.Layer: + True: {state: box-open} + False: {state: box} - type: StaticPrice price: 500 diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/BattleCutterammo.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/BattleCutterammo.yml index 6bb51c40f9..3828365f89 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/BattleCutterammo.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/BattleCutterammo.yml @@ -34,5 +34,5 @@ - type: PowerCellVisuals - type: Riggable - type: ProjectileBatteryAmmoProvider - proto: battlecuttershot + proto: BulletCutter fireCost: 125 diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index d147598d14..5d43045183 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -102,3 +102,116 @@ - type: StunOnCollide stunAmount: 3 knockdownAmount: 4 + +- type: entity + id: BulletCutter + name: Cutter bolt + parent: BaseBullet + noSpawn: true + description: Not too bad, but you still don't want to get hit by it. + components: + - type: Reflective + reflective: + - NonEnergy + - type: Sprite + noRot: false + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + layers: + - state: scatterlaser + shader: unshaded + - type: GatheringProjectile + - type: Projectile + deleteOnCollide: false + damage: + types: + Blunt: 0.5 + # Короткий срок пули + - type: TimedDespawn + lifetime: 0.2 +# +# - type: entity +# name : Cutter bolt +# id: BulletCutter2 +# parent: BaseBullet +# noSpawn: true +# components: +# - type: Reflective +# reflective: +# - Energy +# - type: FlyBySound +# sound: +# collection: EnergyMiss +# params: +# volume: 5 +# - type: Sprite +# noRot: false +# sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi +# layers: +# - state: scatterlaser +# shader: unshaded +# - type: Physics +# - type: Fixtures +# fixtures: +# projectile: +# shape: +# !type:PhysShapeAabb +# bounds: "-0.15,-0.45,0.15,0.15" +# hard: false +# mask: +# - Impassable +# - BulletImpassable +# fly-by: *flybyfixture + # - type: Ammo + # - type: StaminaDamageOnCollide + # damage: 13 + # - type: Projectile + # impactEffect: BulletImpactEffectDisabler + # # deleteOnCollide: false + # damage: + # types: + # Heat: 5 + # Slash: 8 + # soundHit: + # path: "/Audio/_LostParadise/Weapons/Guns/Gunshots/ion_hit_1.ogg" + # - type: TimedDespawn + # lifetime: 0.4 + # - type: GatheringProjectile +# +# - type: entity +# name : battlecutter1 +# id: battlecuttershot +# parent: BaseBullet +# noSpawn: true +# components: +# - type: Reflective +# reflective: +# - Energy +# - type: FlyBySound +# sound: +# collection: EnergyMiss +# params: +# volume: 5 +# - type: Sprite +# sprite: _LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi +# layers: +# - state: ion +# shader: unshaded +# - type: Physics +# - type: Fixtures +# fixtures: +# projectile: +# shape: +# !type:PhysShapeAabb +# bounds: "-0.15,-0.3,0.15,0.3" +# hard: false +# mask: +# - Impassable +# - BulletImpassable +# fly-by: *flybyfixture +# - type: Ammo +# - type: Projectile +# impactEffect: BulletImpactEffectDisabler +# damage: +# types: +# Blunt: 5 +# Slash: 10 diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Doors/Airlocks/eva.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Doors/Airlocks/eva.yml index 2faaa02666..6bcb7d224f 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Structures/Doors/Airlocks/eva.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Structures/Doors/Airlocks/eva.yml @@ -11,3 +11,11 @@ department: Command - type: AccessReader access: [["EVA"]] + +- type: accessLevel + id: EVA + name: EVA + +- type: accessLevel + id: Gateway + name: Gate acces diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Doors/Airlocks/gate.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Doors/Airlocks/gate.yml index 849b4bc677..8019f4f6cd 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Structures/Doors/Airlocks/gate.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Structures/Doors/Airlocks/gate.yml @@ -1,13 +1,13 @@ -# - type: entity -# parent: Airlock -# id: LPPAirlockGate -# suffix: Gate -# components: -# - type: Sprite -# sprite: _LostParadise/Structures/Doors/Standard/gate.rsi -# - type: WiresPanelSecurity -# securityLevel: medSecurity -# - type: PaintableAirlock -# department: Command -# - type: AccessReader -# access: [["Gateway"]] +- type: entity + parent: Airlock + id: LPPAirlockGate + suffix: Gate + components: + - type: Sprite + sprite: _LostParadise/Structures/Doors/Standard/gate.rsi + - type: WiresPanelSecurity + securityLevel: medSecurity + - type: PaintableAirlock + department: Command + - type: AccessReader + access: [["Gateway"]] diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Machines/Computers/computers.yml index db059bf9a5..d73c6043ef 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Structures/Machines/Computers/computers.yml @@ -1,179 +1,179 @@ -- type: entity - parent: ComputerComms - id: LPPCEComputerComms - name: chief engineer communications computer - description: A computer used to make station wide announcements via keyboard, set the appropriate alert level. - components: - - type: Sprite - layers: - - map: ["computerLayerBody"] - state: computer - - map: ["computerLayerKeyboard"] - state: generic_keyboard - - map: ["computerLayerScreen"] - state: comm - - map: ["computerLayerKeys"] - state: generic_keys - - type: AccessReader - access: [[ "ChiefEngineer" ]] - - type: CommunicationsConsole - title: comms-console-announcement-title-ce - canShuttle: false - global: true - sound: /Audio/_LostParadise/Announcement/se.ogg - - type: Computer - board: LPPCECommsComputerCircuitboard - - type: PointLight - radius: 1.5 - energy: 1.6 - color: "#3c5eb5" - -- type: entity - parent: ComputerComms - id: LPPCapComputerComms - name: captain communications computer - description: A computer used to make station wide announcements via keyboard, set the appropriate alert level. - components: - - type: Sprite - layers: - - map: ["computerLayerBody"] - state: computer - - map: ["computerLayerKeyboard"] - state: generic_keyboard - - map: ["computerLayerScreen"] - state: comm - - map: ["computerLayerKeys"] - state: generic_keys - - type: AccessReader - access: [[ "Captain" ]] - - type: CommunicationsConsole - title: comms-console-announcement-title-cap - canShuttle: false - global: true - sound: /Audio/_LostParadise/Announcement/kep.ogg - - type: Computer - board: LPPCapCommsComputerCircuitboard - - type: PointLight - radius: 1.5 - energy: 1.6 - color: "#3c5eb5" - -- type: entity - parent: ComputerComms - id: LPPHopComputerComms - name: head of personell communications computer - description: A computer used to make station wide announcements via keyboard, set the appropriate alert level. - components: - - type: Sprite - layers: - - map: ["computerLayerBody"] - state: computer - - map: ["computerLayerKeyboard"] - state: generic_keyboard - - map: ["computerLayerScreen"] - state: comm - - map: ["computerLayerKeys"] - state: generic_keys - - type: AccessReader - access: [[ "HeadOfPersonnel" ]] - - type: CommunicationsConsole - title: comms-console-announcement-title-hop - canShuttle: false - global: true - sound: /Audio/_LostParadise/Announcement/hop.ogg - - type: Computer - board: LPPHopCommsComputerCircuitboard - - type: PointLight - radius: 1.5 - energy: 1.6 - color: "#3c5eb5" - -- type: entity - parent: ComputerComms - id: LPPHosComputerComms - name: head of security communications computer - description: A computer used to make station wide announcements via keyboard, set the appropriate alert level. - components: - - type: Sprite - layers: - - map: ["computerLayerBody"] - state: computer - - map: ["computerLayerKeyboard"] - state: generic_keyboard - - map: ["computerLayerScreen"] - state: comm - - map: ["computerLayerKeys"] - state: generic_keys - - type: AccessReader - access: [[ "HeadOfSecurity" ]] - - type: CommunicationsConsole - title: comms-console-announcement-title-hos - canShuttle: false - global: true - sound: /Audio/_LostParadise/Announcement/hos.ogg - - type: Computer - board: LPPHosCommsComputerCircuitboard - - type: PointLight - radius: 1.5 - energy: 1.6 - color: "#3c5eb5" - -- type: entity - parent: ComputerComms - id: LPPRDComputerComms - name: research director communications computer - description: A computer used to make station wide announcements via keyboard, set the appropriate alert level. - components: - - type: Sprite - layers: - - map: ["computerLayerBody"] - state: computer - - map: ["computerLayerKeyboard"] - state: generic_keyboard - - map: ["computerLayerScreen"] - state: comm - - map: ["computerLayerKeys"] - state: generic_keys - - type: AccessReader - access: [[ "ResearchDirector" ]] - - type: CommunicationsConsole - title: comms-console-announcement-title-rd - canShuttle: false - global: true - sound: /Audio/_LostParadise/Announcement/rd.ogg - - type: Computer - board: LPPRDCommsComputerCircuitboard - - type: PointLight - radius: 1.5 - energy: 1.6 - color: "#3c5eb5" - -- type: entity - parent: ComputerComms - id: LPPCmoComputerComms - name: chief medical officer communications computer - description: A computer used to make station wide announcements via keyboard, set the appropriate alert level. - components: - - type: Sprite - layers: - - map: ["computerLayerBody"] - state: computer - - map: ["computerLayerKeyboard"] - state: generic_keyboard - - map: ["computerLayerScreen"] - state: comm - - map: ["computerLayerKeys"] - state: generic_keys - - type: AccessReader - access: [[ "ChiefMedicalOfficer" ]] - - type: CommunicationsConsole - title: comms-console-announcement-title-cmo - canShuttle: false - global: true - sound: /Audio/_LostParadise/Announcement/cmo.ogg - - type: Computer - board: LPPCmoCommsComputerCircuitboard - - type: PointLight - radius: 1.5 - energy: 1.6 - color: "#3c5eb5" +# - type: entity +# parent: ComputerComms +# id: LPPCEComputerComms +# name: chief engineer communications computer +# description: A computer used to make station wide announcements via keyboard, set the appropriate alert level. +# components: +# - type: Sprite +# layers: +# - map: ["computerLayerBody"] +# state: computer +# - map: ["computerLayerKeyboard"] +# state: generic_keyboard +# - map: ["computerLayerScreen"] +# state: comm +# - map: ["computerLayerKeys"] +# state: generic_keys +# - type: AccessReader +# access: [[ "ChiefEngineer" ]] +# - type: CommunicationsConsole +# title: comms-console-announcement-title-ce +# canShuttle: false +# global: true +# sound: /Audio/_LostParadise/Announcement/se.ogg +# - type: Computer +# board: LPPCECommsComputerCircuitboard +# - type: PointLight +# radius: 1.5 +# energy: 1.6 +# color: "#3c5eb5" +# +# - type: entity +# parent: ComputerComms +# id: LPPCapComputerComms +# name: captain communications computer +# description: A computer used to make station wide announcements via keyboard, set the appropriate alert level. +# components: +# - type: Sprite +# layers: +# - map: ["computerLayerBody"] +# state: computer +# - map: ["computerLayerKeyboard"] +# state: generic_keyboard +# - map: ["computerLayerScreen"] +# state: comm +# - map: ["computerLayerKeys"] +# state: generic_keys +# - type: AccessReader +# access: [[ "Captain" ]] +# - type: CommunicationsConsole +# title: comms-console-announcement-title-cap +# canShuttle: false +# global: true +# sound: /Audio/_LostParadise/Announcement/kep.ogg +# - type: Computer +# board: LPPCapCommsComputerCircuitboard +# - type: PointLight +# radius: 1.5 +# energy: 1.6 +# color: "#3c5eb5" +# +# - type: entity +# parent: ComputerComms +# id: LPPHopComputerComms +# name: head of personell communications computer +# description: A computer used to make station wide announcements via keyboard, set the appropriate alert level. +# components: +# - type: Sprite +# layers: +# - map: ["computerLayerBody"] +# state: computer +# - map: ["computerLayerKeyboard"] +# state: generic_keyboard +# - map: ["computerLayerScreen"] +# state: comm +# - map: ["computerLayerKeys"] +# state: generic_keys +# - type: AccessReader +# access: [[ "HeadOfPersonnel" ]] +# - type: CommunicationsConsole +# title: comms-console-announcement-title-hop +# canShuttle: false +# global: true +# sound: /Audio/_LostParadise/Announcement/hop.ogg +# - type: Computer +# board: LPPHopCommsComputerCircuitboard +# - type: PointLight +# radius: 1.5 +# energy: 1.6 +# color: "#3c5eb5" +# +# - type: entity +# parent: ComputerComms +# id: LPPHosComputerComms +# name: head of security communications computer +# description: A computer used to make station wide announcements via keyboard, set the appropriate alert level. +# components: +# - type: Sprite +# layers: +# - map: ["computerLayerBody"] +# state: computer +# - map: ["computerLayerKeyboard"] +# state: generic_keyboard +# - map: ["computerLayerScreen"] +# state: comm +# - map: ["computerLayerKeys"] +# state: generic_keys +# - type: AccessReader +# access: [[ "HeadOfSecurity" ]] +# - type: CommunicationsConsole +# title: comms-console-announcement-title-hos +# canShuttle: false +# global: true +# sound: /Audio/_LostParadise/Announcement/hos.ogg +# - type: Computer +# board: LPPHosCommsComputerCircuitboard +# - type: PointLight +# radius: 1.5 +# energy: 1.6 +# color: "#3c5eb5" +# +# - type: entity +# parent: ComputerComms +# id: LPPRDComputerComms +# name: research director communications computer +# description: A computer used to make station wide announcements via keyboard, set the appropriate alert level. +# components: +# - type: Sprite +# layers: +# - map: ["computerLayerBody"] +# state: computer +# - map: ["computerLayerKeyboard"] +# state: generic_keyboard +# - map: ["computerLayerScreen"] +# state: comm +# - map: ["computerLayerKeys"] +# state: generic_keys +# - type: AccessReader +# access: [[ "ResearchDirector" ]] +# - type: CommunicationsConsole +# title: comms-console-announcement-title-rd +# canShuttle: false +# global: true +# sound: /Audio/_LostParadise/Announcement/rd.ogg +# - type: Computer +# board: LPPRDCommsComputerCircuitboard +# - type: PointLight +# radius: 1.5 +# energy: 1.6 +# color: "#3c5eb5" +# +# - type: entity +# parent: ComputerComms +# id: LPPCmoComputerComms +# name: chief medical officer communications computer +# description: A computer used to make station wide announcements via keyboard, set the appropriate alert level. +# components: +# - type: Sprite +# layers: +# - map: ["computerLayerBody"] +# state: computer +# - map: ["computerLayerKeyboard"] +# state: generic_keyboard +# - map: ["computerLayerScreen"] +# state: comm +# - map: ["computerLayerKeys"] +# state: generic_keys +# - type: AccessReader +# access: [[ "ChiefMedicalOfficer" ]] +# - type: CommunicationsConsole +# title: comms-console-announcement-title-cmo +# canShuttle: false +# global: true +# sound: /Audio/_LostParadise/Announcement/cmo.ogg +# - type: Computer +# board: LPPCmoCommsComputerCircuitboard +# - type: PointLight +# radius: 1.5 +# energy: 1.6 +# color: "#3c5eb5" diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 54df871338..0b841d8372 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -28,15 +28,15 @@ # Expeditor -# - type: entity -# id: LockerExpeditor -# parent: LockerBaseSecure -# name: Expeditor Locker -# components: -# - type: Appearance -# - type: EntityStorageVisuals -# stateBaseClosed: expeditor -# stateDoorOpen: expeditor_open -# stateDoorClosed: expeditor_door -# - type: AccessReader -# access: [["Gateway"]] +- type: entity + id: LockerExpeditor + parent: LockerBaseSecure + name: Expeditor Locker + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: expeditor + stateDoorOpen: expeditor_open + stateDoorClosed: expeditor_door + - type: AccessReader + access: [["Gateway"]] diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Science/expeditor.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Science/expeditor.yml index cc7a3fee96..9ab8156e7d 100644 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/Science/expeditor.yml +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/Science/expeditor.yml @@ -17,8 +17,8 @@ access: - Research - Maintenance -# - Gateway -# - EVA + - Gateway + - EVA - type: startingGear id: ExpeditorGear diff --git "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/critical-luck.rsi/\320\272\321\200\320\270\321\202\320\270\321\207\320\265\321\201\320\272\320\260\321\217 \321\203\320\264\320\260\321\207\320\260.txt" "b/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/critical-luck.rsi/\320\272\321\200\320\270\321\202\320\270\321\207\320\265\321\201\320\272\320\260\321\217 \321\203\320\264\320\260\321\207\320\260.txt" new file mode 100644 index 0000000000..b18a698ce7 --- /dev/null +++ "b/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/critical-luck.rsi/\320\272\321\200\320\270\321\202\320\270\321\207\320\265\321\201\320\272\320\260\321\217 \321\203\320\264\320\260\321\207\320\260.txt" @@ -0,0 +1,2 @@ +В свое время, очень популярные у солдат сигареты. +Прожарка боевым пламенем придает табаку улучшенный вкус и понижает кислотность, облегчает воздействие сигарет на горло...