Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Фикс заказы #89

Merged
merged 6 commits into from
Sep 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
sprite: Objects/Weapons/Guns/SMGs/wt550.rsi
state: icon
product: CrateArmorySMG
cost: 9000
cost: 13000
category: cargoproduct-category-name-armory
group: market

Expand All @@ -14,7 +14,7 @@
sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
state: icon
product: CrateArmoryShotgun
cost: 7000
cost: 11000
category: cargoproduct-category-name-armory
group: market

Expand Down Expand Up @@ -44,7 +44,7 @@
sprite: Objects/Weapons/Guns/Battery/laser_gun.rsi
state: icon
product: CrateArmoryLaser
cost: 4800
cost: 8800
category: cargoproduct-category-name-armory
group: market

Expand All @@ -54,6 +54,6 @@
sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
state: icon
product: CrateArmoryPistols
cost: 5200
cost: 6000
category: cargoproduct-category-name-armory
group: market
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Cargo/cargo_security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
sprite: DeltaV/Clothing/OuterClothing/Armor/riot.rsi # DeltaV - resprite
state: icon
product: CrateSecurityRiot
cost: 5500
cost: 8000
category: cargoproduct-category-name-security
group: market

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,16 @@
LPPClothingUniformBlackTracksuit: 4
LPPClothingUniformBlueTracksuit: 4
LPPClothingUniformRedTracksuit: 4
LPPClothingNeckShemagGreen: 4
LPPClothingNeckShemagRed: 4
LPPClothingNeckShemagBrown: 4
LPPClothingNeckShemagPurple: 4
LPPClothingNeckShemagBlue: 4
LPPClothingNeckShemagWhite: 4
contrabandInventory:
ClothingMaskNeckGaiter: 2
ClothingUniformJumpsuitTacticool: 1
ClothingUniformJumpskirtTacticool: 1
ClothingUniformJumpsuitTacticool: 2
ClothingUniformJumpskirtTacticool: 2
ClothingEyesGlassesSunglasses: 2
ClothingHandsGlovesColorBlack: 4
ClothingHandsGlovesColorGray: 4
Expand All @@ -74,4 +80,5 @@
ClothingHandsGlovesColorBlue: 2
ClothingHandsGlovesColorGreen: 2
ClothingHandsGlovesColorOrange: 2
ClothingHandsGlovesColorPurple: 2
ClothingHandsGlovesColorPurple: 2
LPPClothingNeckShemagNPZ: 4
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
Fulton: 2
#LPP
WeaponCrusherDagger: 2
contrabandInventory:
# LPPWeaponSyndieGlaive: 1
ClothingBackpackDuffelSyndicate: 1
emaggedInventory:
LPPWeaponSyndieGlaive: 1
ClothingBackpackDuffelSyndicate: 1
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@
ClothingOuterArmorDuraVest: 2
ClothingHeadHelmetBasic: 2 # DeltaV - added helmets to the SecTech. Another line of defense between the tide and your grey matter.
BreachingCharge: 8
LPPWeaponEnergyGunSoleil: 2 #LPP
LPPTelebaton: 3 #LPP
# security officers need to follow a diet regimen!
contrabandInventory:
FoodDonutHomer: 12
FoodBoxDonut: 2
#box evidence
LPPTelebaton: 3 #LPP
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,7 @@
ClothingHeadBandBlack: 2
ClothingHeadBandSkull: 1
LPPClothingHeadSecHat: 2
# contrabandInventory:
# ClothingMaskClownSecurity: 1
LPPClothingBalaclavawide: 4
ContrabandInventory:
ClothingMaskClownSecurity: 1
LPPClothingMaskKinkyMuzzle: 1
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
- type: messagePack
id: PrideDrobeAds
messages:
- advertisement-pride-1
- advertisement-pride-2
- advertisement-pride-3
# - advertisement-pride-1
# - advertisement-pride-2
# - advertisement-pride-3
# Увы (Нет бля УвУ)
- advertisement-sectech-1
- advertisement-sectech-2
- advertisement-sectech-3
- advertisement-sectech-4
- advertisement-sectech-5

- type: messagePack
id: PrideDrobeGoodbyes
messages:
- thankyou-pride-1
- thankyou-pride-2
# - thankyou-pride-1
# - thankyou-pride-2
Original file line number Diff line number Diff line change
@@ -1,29 +1,15 @@
- type: vendingMachineInventory
id: PrideDrobeInventory
startingInventory:
ClothingNeckLGBTPin: 3
ClothingNeckAromanticPin: 3
ClothingNeckAsexualPin: 3
ClothingNeckBisexualPin: 3
ClothingNeckIntersexPin: 3
ClothingNeckLesbianPin: 3
ClothingNeckNonBinaryPin: 3
ClothingNeckPansexualPin: 3
ClothingNeckTransPin: 3
PlushieSharkBlue: 2
PlushieSharkPink: 2
PlushieSharkGrey: 2
ClothingNeckCloakTrans: 2
ClothingNeckCloakAro: 2
ClothingNeckCloakAce: 2
ClothingNeckCloakBi: 2
ClothingNeckCloakIntersex: 2
ClothingNeckCloakEnby: 2
ClothingNeckCloakPan: 2
ClothingNeckCloakGay: 2
ClothingNeckCloakLesbian: 2
ClothingHeadHatXmasCrown: 2
BedsheetRainbow: 2
ClothingUniformColorRainbow: 2
ClothingUnderSocksCoder: 1
ClothingUnderSocksBee: 1
ClothingNeckRussianPin: 99
ClothingUnderSocksCoder: 99
ClothingNeckCloakTrans: 3
ClothingNeckCloakAce: 3
ClothingNeckCloakAro: 3
ClothingNeckCloakBi: 3
ClothingNeckCloakIntersex: 3
ClothingNeckCloakLesbian: 3
ClothingNeckCloakGay: 3
ClothingNeckCloakEnby: 3
ClothingNeckCloakPan: 3
#Простите Дельтовцы, но мы русские с нами УК и КОАП РФ
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
- type: entity
parent: BaseItem
id: LGBTQHandyFlag
name: LGBTQ handheld flag
description: "The be gay do crime handy flag."
name: флаг Франции #6.21 КОАП РФ
description: Национальный флаг французов #6.21 КОАП РФ
components:
- type: Sprite
sprite: Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,32 @@
Heat: 0.95
- type: Tag
tags:
- HidesHair
# - HidesHair
- WhitelistChameleon
- HidesNose
# - HidesNose

- type: entity
parent: ClothingMaskGas
id: LPPClothingMaskNPZGasmask
name: противогаз спецназа НПЗ
description: Усовершенствованная модель противогаза спецназа из далёких корпоративных воин. Сможет защитить лицо от различных осколков. Защита глаз от вспышек и сварки гарантирована.
components:
- type: Sprite
sprite: _LostParadise/Clothing/Mask/NPZgas.rsi
- type: Clothing
sprite: _LostParadise/Clothing/Mask/NPZgas.rsi
- type: Armor
modifiers:
coefficients:
Blunt: 0.9
Slash: 0.9
Piercing: 0.9
Heat: 0.9
- type: Tag
tags:
# - HidesHair
- WhitelistChameleon
# - HidesNose
- type: IdentityBlocker
- type: FlashImmunity
- type: EyeProtection
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
sprite: _LostParadise/Clothing/Neck/shemags/greenup.rsi
- type: Clothing
sprite: _LostParadise/Clothing/Neck/shemags/greenup.rsi
- type: IdentityBlocker

- type: entity
parent: ClothingNeckBase
Expand Down Expand Up @@ -57,6 +58,7 @@
sprite: _LostParadise/Clothing/Neck/shemags/redup.rsi
- type: Clothing
sprite: _LostParadise/Clothing/Neck/shemags/redup.rsi
- type: IdentityBlocker

- type: entity
parent: ClothingNeckBase
Expand Down Expand Up @@ -87,6 +89,7 @@
sprite: _LostParadise/Clothing/Neck/shemags/blueup.rsi
- type: Clothing
sprite: _LostParadise/Clothing/Neck/shemags/blueup.rsi
- type: IdentityBlocker

- type: entity
parent: ClothingNeckBase
Expand Down Expand Up @@ -117,6 +120,7 @@
sprite: _LostParadise/Clothing/Neck/shemags/brownup.rsi
- type: Clothing
sprite: _LostParadise/Clothing/Neck/shemags/brownup.rsi
- type: IdentityBlocker

- type: entity
parent: ClothingNeckBase
Expand Down Expand Up @@ -147,6 +151,7 @@
sprite: _LostParadise/Clothing/Neck/shemags/purpleup.rsi
- type: Clothing
sprite: _LostParadise/Clothing/Neck/shemags/purpleup.rsi
- type: IdentityBlocker

- type: entity
parent: ClothingNeckBase
Expand Down Expand Up @@ -177,3 +182,32 @@
sprite: _LostParadise/Clothing/Neck/shemags/NPZup.rsi
- type: Clothing
sprite: _LostParadise/Clothing/Neck/shemags/NPZup.rsi
- type: IdentityBlocker

- type: entity
parent: ClothingNeckBase
id: LPPClothingNeckShemagWhite
name: белый шемаг
description: тёплая шёлковая ткань, защищающая от пыли и холода, а так же придающая брутальности и тактикульности носителю.
components:
- type: Sprite
sprite: _LostParadise/Clothing/Neck/shemags/whitedown.rsi
- type: Clothing
sprite: _LostParadise/Clothing/Neck/shemags/whitedown.rsi
- type: ToggleableClothing
clothingPrototype: LPPClothingMaskShemagWhite
requiredSlot:
- neck
slot: mask

- type: entity
parent: ClothingMaskBase
id: LPPClothingMaskShemagWhite
noSpawn: true
name: белый шемаг
components:
- type: Sprite
sprite: _LostParadise/Clothing/Neck/shemags/whiteup.rsi
- type: Clothing
sprite: _LostParadise/Clothing/Neck/shemags/whiteup.rsi
- type: IdentityBlocker
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
parent: ClothingShoesMilitaryBase
id: LPPClothingShoesBootsNPZ
name: Сапоги НПЗ
description: Нет, вы не перепутали обувь цветами, это такой стиль.
description: Крепкие берцы для любой труднопроходимой местности.
components:
- type: Sprite
sprite: _LostParadise/Clothing/Shoes/Boots/upgjackboots.rsi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
- id: LPPweaponPibodi
- id: LPPMagazineBoxHunting
- id: LPPClothingOuterHardsuitHunter
# - id: LPPWeaponBattleCutter
- id: LPPWeaponBattleCutter
- id: LPPWeaponCutterMagazine
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
#- type: entity
# name: боевой резак
# parent: BaseWeaponPowerCellSmall
# id: LPPWeaponBattleCutter
# description: Старая модель резаков, что, вроде как, предназначались для горной добычи, теперь же для рубки ксеносов.
# components:
# - type: Sprite
# sprite: _LostParadise/Objects/Weapons/Guns/Pistols/battlecutter.rsi
# layers:
# - state: base
# map: ["enum.GunVisualLayers.Base"]
# - state: mag-unshaded-4
# map: ["enum.GunVisualLayers.MagUnshaded"]
# shader: unshaded
# - type: Item
# size: Small
# shape:
# - 0,0,1,0
# - 0,1,0,1
# - type: Clothing
# sprite: _LostParadise/Objects/Weapons/Guns/Pistols/battlecutter.rsi
# soundForce: true
# slots:
# - Belt
# - suitStorage
# - type: Gun
# soundGunshot:
# path: "/Audio/_LostParadise/Weapons/Guns/Gunshots/BattleCutterFire.ogg"
# params:
# volume: 100
# soundForce: true
# - type: AmmoCounter
# - type: ItemSlots
# slots:
# gun_magazine:
# name: Magazine
# startingItem: LPPWeaponCutterMagazine
# - type: MagazineVisuals
# magState: mag
# steps: 5
# zeroVisible: true
- type: entity
name: боевой резак
parent: BaseWeaponPowerCellSmall
id: LPPWeaponBattleCutter
description: Старая модель резаков, что, вроде как, предназначались для горной добычи, теперь же для рубки ксеносов.
components:
- type: Sprite
sprite: _LostParadise/Objects/Weapons/Guns/Pistols/battlecutter.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-unshaded-4
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Item
size: Small
shape:
- 0,0,1,0
- 0,1,0,1
- type: Clothing
sprite: _LostParadise/Objects/Weapons/Guns/Pistols/battlecutter.rsi
soundForce: true
slots:
- Belt
- suitStorage
- type: Gun
soundGunshot:
path: "/Audio/_LostParadise/Weapons/Guns/Gunshots/BattleCutterFire.ogg"
params:
volume: 100
soundForce: true
- type: AmmoCounter
- type: ItemSlots
slots:
gun_magazine:
name: Magazine
startingItem: LPPWeaponCutterMagazine
- type: MagazineVisuals
magState: mag
steps: 5
zeroVisible: true
Loading
Loading