diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Belt/belts.yml index 8bdda38022..6435af7328 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Belt/belts.yml @@ -11,7 +11,8 @@ - type: Item size: Large - type: Storage - capacity: 120 + grid: + - 0,0,3,2 - type: entity parent: ClothingBeltStorageBase diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits_base.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits_base.yml index aeef61f9c6..b2a10670c8 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits_base.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits_base.yml @@ -6,7 +6,8 @@ - type: Item size: Huge - type: Storage - capacity: 16 + grid: + - 1,1,3,3 # я хз как это работает, потому пусть будет так - type: ContainerContainer containers: storagebase: !type:Container diff --git a/Resources/Prototypes/_LostParadise/Entities/Mobs/Cryborgs/Borgs.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/Cryborgs/Borgs.yml index 1d565e00ed..2757f8ac6b 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Mobs/Cryborgs/Borgs.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Mobs/Cryborgs/Borgs.yml @@ -216,7 +216,7 @@ - BorgModuleService hasMindState: robot_e noMindState: robot_e_r - name: киборг-эротический + # name: киборг-эротический - type: PointLight enabled: false color: "#A83AAE" @@ -298,4 +298,3 @@ startingItem: PowerCellMedium - type: RandomMetadata nameSegments: [names_borg] - diff --git a/Resources/Prototypes/_LostParadise/Entities/Mobs/Cryborgs/Cyborg_tag.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/Cryborgs/Cyborg_tag.yml deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Resources/Prototypes/_LostParadise/Entities/Mobs/Cryborgs/MediKitibot.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/Cryborgs/MediKitibot.yml index fb7fb31d06..8f12ccb790 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Mobs/Cryborgs/MediKitibot.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Mobs/Cryborgs/MediKitibot.yml @@ -31,7 +31,7 @@ - BorgModuleMedical hasMindState: medibot1 noMindState: medibot1 - name: киборг-доктор + # name: киборг-доктор - type: Construction node: medical - type: IntrinsicRadioTransmitter diff --git a/Resources/Prototypes/_LostParadise/Entities/Mobs/Cryborgs/borg_modules.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/Cryborgs/borg_modules.yml index e77992c650..199392f695 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Mobs/Cryborgs/borg_modules.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Mobs/Cryborgs/borg_modules.yml @@ -147,7 +147,7 @@ - type: ItemBorgModule items: - LPPClothingBackpackBorgs - hands: 1 + # hands: 1 - type: entity parent: ClothingBackpack diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/door_remote.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/door_remote.yml index 591b11bf3b..e9605d1b73 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/door_remote.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/door_remote.yml @@ -15,19 +15,19 @@ groups: - AllAccess -- type: entity - parent: DoorRemoteDefault - id: DoorRemoteCC - name: Пульт ЦК - suffix: Cenctom - components: - - type: Sprite - layers: - - state: door_remotebase - - state: door_remotelightscolour - color: "#2eba22" - - state: door_remotescreencolour - color: "#22871a" - - type: Access - groups: - - CentCom +# - type: entity +# parent: DoorRemoteDefault +# id: DoorRemoteCC +# name: Пульт ЦК +# suffix: Cenctom +# components: +# - type: Sprite +# layers: +# - state: door_remotebase +# - state: door_remotelightscolour +# color: "#2eba22" +# - state: door_remotescreencolour +# color: "#22871a" +# - type: Access +# groups: +# - CentCom diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/RingStorage.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/RingStorage.yml index 33b7277162..628731b3ef 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/RingStorage.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/RingStorage.yml @@ -8,7 +8,8 @@ sprite: _LostParadise/Objects/Misc/RingBox.rsi state: box - type: Storage - capacity: 4 + grid: + - 1,1,3,3 - type: Item sprite: _LostParadise/Objects/Misc/RingBox.rsi size: Normal @@ -29,4 +30,3 @@ openIcon: box-open - type: StaticPrice price: 500 - diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Doors/Airlocks/gate.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Doors/Airlocks/gate.yml index 8019f4f6cd..849b4bc677 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/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 0b841d8372..54df871338 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/Entities/Structures/Windows/directional.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Windows/directional.yml deleted file mode 100644 index 1340483ea2..0000000000 --- a/Resources/Prototypes/_LostParadise/Entities/Structures/Windows/directional.yml +++ /dev/null @@ -1,48 +0,0 @@ - -- type: entity - id: PlastitaniumPwindow - parent: WindowDirectional - name: plastitanium pwindow - description: Don't smudge up the glass down there. - placement: - mode: SnapgridCenter - snap: - - Window - components: - - type: Sprite - sprite: _LostParadise/Structures/Windows/directional.rsi - state: pwindow - noRot: false - - type: Icon - sprite: _LostParadise/Structures/Windows/directional.rsi - state: pwindow - - type: Construction - graph: PlastitaniumWindow - node: PlastitaniumPwindow - - type: Appearance - - type: DamageVisuals - thresholds: [4, 8, 12] - damageDivisor: 10 - trackAllDamage: true - damageOverlay: - sprite: Structures/Windows/cracks_directional.rsi - - type: Damageable - damageModifierSet: RGlass - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 250 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: WindowShatter - - !type:SpawnEntitiesBehavior - spawn: - ShardGlassReinforced: - min: 1 - max: 2 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: StaticPrice - price: 22 diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Windows/survival.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Windows/survival.yml deleted file mode 100644 index 9c20ed9165..0000000000 --- a/Resources/Prototypes/_LostParadise/Entities/Structures/Windows/survival.yml +++ /dev/null @@ -1,50 +0,0 @@ -#- type: entity -# id: LPPSalvageWindow -# name: Salvage window -# parent: Window -# components: -# - type: Sprite -# drawdepth: WallTops -# sprite: _LostParadise/Structures/Windows/shuttle_window.rsi -# - type: Icon -# sprite: _LostParadise/Structures/Windows/shuttle_window.rsi -# - type: Damageable -# damageContainer: Inorganic -# damageModifierSet: RGlass -# - type: Destructible -# thresholds: -# - trigger: -# !type:DamageTrigger -# damage: 1000 -# behaviors: -# - !type:DoActsBehavior -# acts: [ "Destruction" ] -# - trigger: -# !type:DamageTrigger -# damage: 500 -# behaviors: -# - !type:PlaySoundBehavior -# sound: -# collection: GlassBreak -# - !type:SpawnEntitiesBehavior -# spawn: -# ShardGlassReinforced: -# min: 1 -# max: 2 -# PartRodMetal: -# min: 1 -# max: 2 -# - !type:DoActsBehavior -# acts: [ "Destruction" ] -# - type: IconSmooth -# base: swindow -# - type: Appearance -# - type: DamageVisuals -# thresholds: [4, 8, 12] -# damageDivisor: 36 -# trackAllDamage: true -# damageOverlay: -# sprite: Structures/Windows/cracks.rsi -# - type: StaticPrice -# price: 75 -# diff --git a/Resources/Prototypes/_LostParadise/Recipes/Construction/Graphs/structures/AtmosDeviceFanTiny.yml b/Resources/Prototypes/_LostParadise/Recipes/Construction/Graphs/structures/AtmosDeviceFanTiny.yml index 8d094040d3..8e69b015c1 100644 --- a/Resources/Prototypes/_LostParadise/Recipes/Construction/Graphs/structures/AtmosDeviceFanTiny.yml +++ b/Resources/Prototypes/_LostParadise/Recipes/Construction/Graphs/structures/AtmosDeviceFanTiny.yml @@ -19,5 +19,5 @@ - to: start completed: - !type:SpawnPrototype - prototype: Plasteel - amount: 10 \ No newline at end of file + prototype: SheetPlasteel10 + amount: 1 diff --git a/Resources/Prototypes/_LostParadise/Recipes/Construction/Graphs/structures/FloorDrain.yml b/Resources/Prototypes/_LostParadise/Recipes/Construction/Graphs/structures/FloorDrain.yml index 7b3196f74b..583c1f355d 100644 --- a/Resources/Prototypes/_LostParadise/Recipes/Construction/Graphs/structures/FloorDrain.yml +++ b/Resources/Prototypes/_LostParadise/Recipes/Construction/Graphs/structures/FloorDrain.yml @@ -19,5 +19,5 @@ - to: start completed: - !type:SpawnPrototype - prototype: Plasteel - amount: 10 \ No newline at end of file + prototype: SheetPlasteel10 + amount: 1 diff --git a/Resources/Prototypes/_LostParadise/Recipes/Lathes/robotics.yml b/Resources/Prototypes/_LostParadise/Recipes/Lathes/robotics.yml new file mode 100644 index 0000000000..a2d885a37d --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Recipes/Lathes/robotics.yml @@ -0,0 +1,318 @@ +# ============================================================ +# +# [Части киборгов LPP] +# +# ============================================================ + +# [Киборг службы безопасности] + +- type: latheRecipe + id: LPPLeftArmBorgSecurity + result: LPPLeftArmBorgSecurity + category: Robotics + completetime: 4 + materials: + Steel: 350 + Glass: 200 + +- type: latheRecipe + id: LPPRightArmBorgSecurity + result: LPPRightArmBorgSecurity + category: Robotics + completetime: 4 + materials: + Steel: 350 + Glass: 200 + +- type: latheRecipe + id: LPPLeftLegBorgSecurity + result: LPPLeftLegBorgSecurity + category: Robotics + completetime: 4 + materials: + Steel: 350 + Glass: 200 + +- type: latheRecipe + id: LPPRightLegBorgSecurity + result: LPPRightLegBorgSecurity + category: Robotics + completetime: 4 + materials: + Steel: 350 + Glass: 200 + +- type: latheRecipe + id: LPPHeadBorgSecurity + result: LPPHeadBorgSecurity + category: Robotics + completetime: 4 + materials: + Steel: 350 + Glass: 200 + +- type: latheRecipe + id: LPPTorsoBorgSecurity + result: LPPTorsoBorgSecurity + category: Robotics + completetime: 4 + materials: + Steel: 350 + Glass: 200 + +# [Эротический киборг] +- type: latheRecipe + id: LPPLeftArmBorgErotic + result: LPPLeftArmBorgErotic + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + Plastic: 350 + +- type: latheRecipe + id: LPPRightArmBorgErotic + result: LPPRightArmBorgErotic + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + Plastic: 350 + +- type: latheRecipe + id: LPPLeftLegBorgErotic + result: LPPLeftLegBorgErotic + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + Plastic: 350 + +- type: latheRecipe + id: LPPRightLegBorgErotic + result: LPPRightLegBorgErotic + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + Plastic: 350 + +- type: latheRecipe + id: LPPHeadBorgErotic + result: LPPHeadBorgErotic + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + Plastic: 350 + +- type: latheRecipe + id: LPPTorsoBorgErotic + result: LPPTorsoBorgErotic + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + Plastic: 350 +# [Шахтёрский киборг] +- type: latheRecipe + id: LPPLeftArmBorgMining + result: LPPLeftArmBorgMining + category: Robotics + completetime: 2 + materials: + Steel: 350 + Glass: 100 + +- type: latheRecipe + id: LPPRightArmBorgMining + result: LPPRightArmBorgMining + category: Robotics + completetime: 2 + materials: + Steel: 350 + Glass: 100 + +- type: latheRecipe + id: LPPLeftLegBorgMining + result: LPPLeftLegBorgMining + category: Robotics + completetime: 2 + materials: + Steel: 350 + Glass: 100 + +- type: latheRecipe + id: LPPRightLegBorgMining + result: LPPRightLegBorgMining + category: Robotics + completetime: 2 + materials: + Steel: 350 + Glass: 100 + +- type: latheRecipe + id: LPPHeadBorgMining + result: LPPHeadBorgMining + category: Robotics + completetime: 2 + materials: + Steel: 350 + Glass: 100 + +- type: latheRecipe + id: LPPTorsoBorgMining + result: LPPTorsoBorgMining + category: Robotics + completetime: 2 + materials: + Steel: 350 + Glass: 100 +# [РНД киборг] +- type: latheRecipe + id: LPPLeftArmBorgScience + result: LPPLeftArmBorgScience + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + Plastic: 200 + +- type: latheRecipe + id: LPPRightArmBorgScience + result: LPPRightArmBorgScience + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + Plastic: 200 + +- type: latheRecipe + id: LPPLeftLegBorgScience + result: LPPLeftLegBorgScience + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + Plastic: 200 + +- type: latheRecipe + id: LPPRightLegBorgScience + result: LPPRightLegBorgScience + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + Plastic: 200 + +- type: latheRecipe + id: LPPHeadBorgScience + result: LPPHeadBorgScience + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + Plastic: 200 + +- type: latheRecipe + id: LPPTorsoBorgScience + result: LPPTorsoBorgScience + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + Plastic: 200 + +# ============================================================ +# +# [Модули киборгов LPP] +# +# ============================================================ + +- type: latheRecipe + id: LPPERPModuleBorg + result: LPPERPModuleBorg + category: Robotics + completetime: 3 + materials: + Steel: 250 + Glass: 250 + Plastic: 350 + +- type: latheRecipe + id: LPPBorgModuleLaserWeaponAdvanced + result: LPPBorgModuleLaserWeaponAdvanced + category: Robotics + completetime: 3 + materials: + Steel: 500 + Glass: 500 + Plastic: 200 + Silver: 200 + +- type: latheRecipe + id: LPPBorgModuleLaserWeapon + result: LPPBorgModuleLaserWeapon + category: Robotics + completetime: 3 + materials: + Steel: 400 + Glass: 400 + Plastic: 100 + Silver: 100 + +- type: latheRecipe + id: LPPDroneModuleSecurityTaser + result: LPPDroneModuleSecurityTaser + category: Robotics + completetime: 3 + materials: + Steel: 200 + Glass: 400 + Plastic: 100 + Silver: 100 + +- type: latheRecipe + id: LPPBorgModuleAresst + result: LPPBorgModuleAresst + category: Robotics + completetime: 3 + materials: + Steel: 500 + Glass: 100 + Plastic: 100 + Silver: 100 + +- type: latheRecipe + id: LPPBattleBorgModule + result: LPPBattleBorgModule + category: Robotics + completetime: 3 + materials: + Steel: 500 + Glass: 500 + Plastic: 100 + Silver: 100 + +- type: latheRecipe + id: LPPModuleBorgHands + result: LPPModuleBorgHands + category: Robotics + completetime: 3 + materials: + Steel: 500 + Glass: 500 + Plastic: 500 + Silver: 200 diff --git a/Resources/Prototypes/_LostParadise/Tiles/cover-half.rsi.yml b/Resources/Prototypes/_LostParadise/Tiles/cover-half.rsi.yml index d5e789471c..722d37f079 100644 --- a/Resources/Prototypes/_LostParadise/Tiles/cover-half.rsi.yml +++ b/Resources/Prototypes/_LostParadise/Tiles/cover-half.rsi.yml @@ -4,7 +4,7 @@ sprite: /Textures/_LostParadise/Tiles/CornerFloors/cover-half/cover-half1.png baseTurf: Lattice isSubfloor: true - canCrowbar: false + #canCrowbar: false footstepSounds: collection: FootstepPlating itemDrop: FloorTileItemGrass @@ -16,7 +16,7 @@ sprite: /Textures/_LostParadise/Tiles/CornerFloors/cover-half/cover-half2.png baseTurf: Lattice isSubfloor: true - canCrowbar: false + #canCrowbar: false footstepSounds: collection: FootstepPlating itemDrop: FloorTileItemGrass @@ -28,7 +28,7 @@ sprite: /Textures/_LostParadise/Tiles/CornerFloors/cover-half/cover-half3.png baseTurf: Lattice isSubfloor: true - canCrowbar: false + #canCrowbar: false footstepSounds: collection: FootstepPlating itemDrop: FloorTileItemGrass @@ -40,7 +40,7 @@ sprite: /Textures/_LostParadise/Tiles/CornerFloors/cover-half/cover-half4.png baseTurf: Lattice isSubfloor: true - canCrowbar: false + #canCrowbar: false footstepSounds: collection: FootstepPlating itemDrop: FloorTileItemGrass diff --git a/Resources/Prototypes/_LostParadise/Tiles/lattice-half.yml b/Resources/Prototypes/_LostParadise/Tiles/lattice-half.yml index b7d97bb203..3cc0b72b25 100644 --- a/Resources/Prototypes/_LostParadise/Tiles/lattice-half.yml +++ b/Resources/Prototypes/_LostParadise/Tiles/lattice-half.yml @@ -4,7 +4,7 @@ sprite: /Textures/_LostParadise/Tiles/CornerFloors/lattice-half/lattice-half1.png baseTurf: Lattice isSubfloor: true - canCrowbar: false + #canCrowbar: false isSpace: true footstepSounds: collection: FootstepPlating @@ -18,7 +18,7 @@ sprite: /Textures/_LostParadise/Tiles/CornerFloors/lattice-half/lattice-half2.png baseTurf: Lattice isSubfloor: true - canCrowbar: false + #canCrowbar: false isSpace: true footstepSounds: collection: FootstepPlating @@ -32,7 +32,7 @@ sprite: /Textures/_LostParadise/Tiles/CornerFloors/lattice-half/lattice-half3.png baseTurf: Lattice isSubfloor: true - canCrowbar: false + #canCrowbar: false isSpace: true footstepSounds: collection: FootstepPlating @@ -46,7 +46,7 @@ sprite: /Textures/_LostParadise/Tiles/CornerFloors/lattice-half/lattice-half4.png baseTurf: Lattice isSubfloor: true - canCrowbar: false + #canCrowbar: false isSpace: true footstepSounds: collection: FootstepPlating