-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #89 from MegaDaimond/master
Фикс заказы
- Loading branch information
Showing
173 changed files
with
549 additions
and
186 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 11 additions & 5 deletions
16
Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
38 changes: 12 additions & 26 deletions
38
Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
| #Простите Дельтовцы, но мы русские с нами УК и КОАП РФ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
82 changes: 41 additions & 41 deletions
82
Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Battery/BattleCutter.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
Oops, something went wrong.