Skip to content

Commit

Permalink
Новый контент! (#220)
Browse files Browse the repository at this point in the history
* Новый контент!

* фикс

* фикс2

* фикс3

* фикс4

* фикс5

* Update Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: DarkSide-droids <MY_NAME@example.com>
Co-authored-by: Evgencheg <73418250+Evgencheg@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
  • Loading branch information
4 people authored Sep 30, 2024
1 parent 0844764 commit eac2c79
Show file tree
Hide file tree
Showing 133 changed files with 1,216 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockClothesFilled
cost: 2700
cost: 2920
category: cargoproduct-category-name-service
group: market

Expand Down
16 changes: 16 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@
- id: RubberStampCaptain
# - id: WeaponAntiqueLaser # DeltaV - Remove in favor of the glass box
- id: JetpackCaptainFilled
# - < DarkSide
- id: LPPBoxFolderSecretCap
- id: LPPBoxFolderCap
# - >
- id: MedalCase
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
Expand All @@ -68,6 +72,10 @@
- id: CommsComputerCircuitboard
- id: ClothingHeadsetAltCommand
- id: SpaceCash1000
# - < DarkSide
- id: LPPBoxFolderSecretCap
- id: LPPBoxFolderCap
# - >
- id: PlushieNuke
prob: 0.1
- id: CigarGoldCase
Expand All @@ -91,6 +99,10 @@
contents:
- id: ClothingOuterArmorCaptainCarapace
- id: NukeDisk
# - < DarkSide
- id: LPPBoxFolderSecretCap
- id: LPPBoxFolderCap
# - >
- id: PinpointerNuclear
# - id: CaptainIDCard # Delta V - Replaced by spare ID system. The funny biscuit that I cant even eat.
- id: WeaponDisabler
Expand Down Expand Up @@ -140,6 +152,10 @@
- id: ClothingHandsGlovesInspection # DeltaV - Add inspection gloves for HoP.
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
# -< DarkSide
- id: LPPBoxFolderSecretBlue
prob: 0.6
# - >

- type: entity
id: LockerChiefEngineerFilledHardsuit
Expand Down
17 changes: 17 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
- id: LPPWeaponPistolPF20
- id: LPPMagazinePistolPF20lethal
- id: LPPMagazinePistolPF20Rubber
- id: LPPBoxFolderSecretRed
- id: LPPBoxFolderSecDoc
prob: 0.5
- id: LPPHOSUplinkShop #На будущее, будет хайриском

- type: entity
Expand Down Expand Up @@ -66,6 +69,11 @@
- id: LPPMagazinePistolPF20lethal
- id: LPPMagazinePistolPF20Rubber
prob: 0.5 #Кибербуллинг метаюзеров :D
# -< DarkSide
- id: LPPBoxFolderSecretRed
- id: LPPBoxFolderSecDoc
prob: 0.5
# - >

- type: entity
id: LockerSecurityFilled
Expand Down Expand Up @@ -119,6 +127,10 @@
prob: 0.01
- id: ClothingMaskClown
prob: 0.1
# -< DarkSide
- id: LPPBoxFolderSecDoc
prob: 0.5
# - >
- id: WeaponDisabler
prob: 0.33

Expand Down Expand Up @@ -222,6 +234,11 @@
prob: 0.3
#LPP
- id: LPPClothingOuterDetectiveHardsuit
# -< DarkSide
- id: LPPBoxFolderSecDoc
amount: 2
prob: 0.5
# - >

- type: entity
id: ClosetBombFilled
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@
LPPClothingNeckShemagPurple: 4
LPPClothingNeckShemagBlue: 4
LPPClothingNeckShemagWhite: 4
# - < DarkSide
LPPClothingOuterCoatPajamsSharkGray: 2
LPPClothingOuterCoatPajamsSharkPink: 2
LPPClothingOuterCoatPajamsSharkBlue: 2
# - >
contrabandInventory:
ClothingMaskNeckGaiter: 2
ClothingUniformJumpsuitTacticool: 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
ClothingOuterArmorDuraVest: 2
ClothingHeadHelmetBasic: 2 # DeltaV - added helmets to the SecTech. Another line of defense between the tide and your grey matter.
# BreachingCharge: 8
LPPClothingHandsGlovesTacticalFingerless: 1 # Lost Paradise - Добавление тактических беспалых боевых перчаток
LPPTelebaton: 3 #LPP
# security officers need to follow a diet regimen!
contrabandInventory:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,4 +169,12 @@
- PosterLegitShoukou # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml
- PosterLegitCornzza # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml
- PosterLegitFuckAround # DeltaV Poster, see Resources/Prototypes/DeltaV/Entities/Structures/Wallmount/Signs/posters.yml

# - < DarkSide - LOST PARADISE, see Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/posters.yml
- LPPPosterHappyNewYear
- LPPPosterNoAlcohol
- LPPPosterSport
- LPPPosterTimeTea
# - >

chance: 1
11 changes: 11 additions & 0 deletions Resources/Prototypes/Loadouts/items.yml
Original file line number Diff line number Diff line change
Expand Up @@ -757,3 +757,14 @@
cost: 1
items:
- DrinkVacuumFlask

# - < DarkSide - LOST PARADISE

- type: loadout
id: LPPLoadoutPaperIdCardUSSP
category: Items
cost: 3
items:
- LPPPaperIdCardUSSP

# - >
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
LPPClothingNeckBellCollarPurple: 3
LPPClothingNeckBellCollarOrange: 3
LPPClothingNeckCollarSpiked: 3
LPPClothingNeckCollarHeart: 3 # < DarkSide >
LPPClothingMaskKinkyMuzzle: 3
LPPClothingUniformboobasuit: 3
LPPClothingHeadHatMaid: 3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,19 @@
attackRate: 1.5
damage:
types:
Blunt: 7
Blunt: 7

# - < DarkSide

- type: entity
parent: ClothingHandsGlovesCombat
id: LPPClothingHandsGlovesTacticalFingerless
name: тактические беспалые боевые перчатки
description: Эти тактические перчатки огнеупорны и ударопрочны.
components:
- type: Sprite
sprite: _LostParadise/Clothing/Hands/Gloves/CombatFingerless.rsi
- type: Clothing
sprite: _LostParadise/Clothing/Hands/Gloves/CombatFingerless.rsi

# - >
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,20 @@
- type: Sprite
sprite: _LostParadise/Clothing/Neck/chokers/spiked.rsi
- type: Clothing
sprite: _LostParadise/Clothing/Neck/chokers/spiked.rsi
sprite: _LostParadise/Clothing/Neck/chokers/spiked.rsi

# Made DarkSide - <

- type: entity
parent: ClothingNeckBase
id: LPPClothingNeckCollarHeart
name: чокер c сердцем
description: Чокер с сердцем, вы либо милашка, либо питомец, раз решились такое носить.
components:
- type: Sprite
sprite: _LostParadise/Clothing/Neck/chokers/heart.rsi
- type: Clothing
sprite: _LostParadise/Clothing/Neck/chokers/heart.rsi


# - >
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
# - < DarkSide
# Пижамы акул

- type: entity
parent: ClothingOuterWinterCoat
id: LPPClothingOuterCoatPajamsSharkPink
name: Розовая пижама акулы
description: А я рыба, я рыба, я рыба....
components:
- type: Sprite
sprite: _LostParadise/Clothing/OuterClothing/Pajams/shark_pink.rsi
- type: Clothing
sprite: _LostParadise/Clothing/OuterClothing/Pajams/shark_pink.rsi
- type: Tag
tags:
- ClothMade
- WhitelistChameleon
- HidesHarpyWings
- HidesTail
- type: ToggleableClothing
clothingPrototype: LPPHelmetPajamsSharkPink
- type: ContainerContainer
containers:
toggleable-clothing: !type:ContainerSlot {}
storagebase: !type:Container
ents: []

- type: entity
parent: ClothingHeadBase
id: LPPHelmetPajamsSharkPink
noSpawn: true
name: капюшон пижамы акулы
description: Милота :3
components:
- type: Sprite
sprite: _LostParadise/Clothing/Head/Pajams/shark_pink.rsi
- type: Clothing
sprite: _LostParadise/Clothing/Head/Pajams/shark_pink.rsi
- type: Tag
tags:
- HidesHair

- type: entity
parent: ClothingOuterWinterCoat
id: LPPClothingOuterCoatPajamsSharkBlue
name: Синия пижама акулы
description: А я рыба, я рыба, я рыба....
components:
- type: Sprite
sprite: _LostParadise/Clothing/OuterClothing/Pajams/shark_blue.rsi
- type: Clothing
sprite: _LostParadise/Clothing/OuterClothing/Pajams/shark_blue.rsi
- type: Tag
tags:
- ClothMade
- WhitelistChameleon
- HidesHarpyWings
- HidesTail
- type: ToggleableClothing
clothingPrototype: LPPHelmetPajamsSharkBlue
- type: ContainerContainer
containers:
toggleable-clothing: !type:ContainerSlot {}
storagebase: !type:Container
ents: []

- type: entity
parent: ClothingHeadBase
id: LPPHelmetPajamsSharkBlue
noSpawn: true
name: капюшон пижамы акулы
description: Милота :3
components:
- type: Sprite
sprite: _LostParadise/Clothing/Head/Pajams/shark_blue.rsi
- type: Clothing
sprite: _LostParadise/Clothing/Head/Pajams/shark_blue.rsi
- type: Tag
tags:
- HidesHair

- type: entity
parent: ClothingOuterWinterCoat
id: LPPClothingOuterCoatPajamsSharkGray
name: Серая пижама акулы
description: А я рыба, я рыба, я рыба....
components:
- type: Sprite
sprite: _LostParadise/Clothing/OuterClothing/Pajams/shark_gray.rsi
- type: Clothing
sprite: _LostParadise/Clothing/OuterClothing/Pajams/shark_gray.rsi
- type: Tag
tags:
- ClothMade
- WhitelistChameleon
- HidesHarpyWings
- HidesTail
- type: ToggleableClothing
clothingPrototype: LPPHelmetPajamsSharkGray
- type: ContainerContainer
containers:
toggleable-clothing: !type:ContainerSlot {}
storagebase: !type:Container
ents: []

- type: entity
parent: ClothingHeadBase
id: LPPHelmetPajamsSharkGray
noSpawn: true
name: капюшон пижамы акулы
description: Милота :3
components:
- type: Sprite
sprite: _LostParadise/Clothing/Head/Pajams/shark_gray.rsi
- type: Clothing
sprite: _LostParadise/Clothing/Head/Pajams/shark_gray.rsi
- type: Tag
tags:
- HidesHair

# - >
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
# - < DarkSide
# Удостоврения личности в виде паспорта или что то такое
- type: entity
id: LPPPaperIdCardCentcom
parent: BaseItem
name: Удостоверение личности
description: Это удостоверение личности сотрудника корпорации NanoTrasen... И кажется оно принадлежит Центральному командованию
components:
- type: Sprite
sprite: _LostParadise/Objects/Misc/bureaucracy.rsi
layers:
- state: id-nt
map: [ "enum.ToggleVisuals.Layer" ]
- type: Appearance
- type: GenericVisualizer
visuals:
enum.ToggleVisuals.Toggled:
enum.ToggleVisuals.Layer:
True: {state: open-id-nt}
False: {state: id-nt}
- type: Item
size: Tiny
sprite: _LostParadise/Objects/Misc/bureaucracy.rsi
- type: Tag
tags:
- Book
- Document
- type: ItemToggle
predictable: false
soundActivate:
path: /Audio/Items/candle_blowing.ogg
params:
volume: 10
soundDeactivate:
path: /Audio/Items/candle_blowing.ogg
params:
volume: 10
- type: ItemToggleSize
activatedSize: Small
- type: UseDelay

- type: entity
id: LPPPaperIdCardUSSP
parent: LPPPaperIdCardCentcom
name: Удостоверение личности
description: Это удостоверение личности существа которое имеет или имело гражданство СССП
components:
- type: Sprite
sprite: _LostParadise/Objects/Misc/bureaucracy.rsi
layers:
- state: id-ussp
map: [ "enum.ToggleVisuals.Layer" ]
- type: Appearance
- type: GenericVisualizer
visuals:
enum.ToggleVisuals.Toggled:
enum.ToggleVisuals.Layer:
True: {state: open-id-ussp}
False: {state: id-ussp}
# - >
Loading

0 comments on commit eac2c79

Please sign in to comment.