forked from new-frontiers-14/frontier-station-14
-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Пить из раковины * Двуручные пушки * Священная лиса * Исследовательский диск в аплинк * Модуль энергетического оружия * Возвращение акцента фелинидам
- Loading branch information
1 parent
cfd355e
commit 3ba0e1b
Showing
14 changed files
with
144 additions
and
36 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
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/fun/toys.ftl
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 |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| ent-HolyPlushieOrangeFox = священная лиса | ||
| .desc = Милая плюшевая лиса. Хм.. этот нимб.. |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| - type: entity | ||
| parent: PlushieOrangeFox | ||
| id: HolyPlushieOrangeFox | ||
| name: holy fox plushie | ||
| description: A cute plushie that look like a foxxo! Hmm.. This is very strange.. | ||
| components: | ||
| - type: PointLight | ||
| color: "#FFD700FF" | ||
| energy: 5 | ||
| radius: 3 | ||
| - type: EmitSoundOnUse | ||
| sound: | ||
| path: /Audio/Effects/hallelujah.ogg | ||
| - type: EmitSoundOnLand | ||
| sound: | ||
| path: /Audio/Effects/hallelujah.ogg | ||
| - type: EmitSoundOnActivate | ||
| sound: | ||
| path: /Audio/Effects/hallelujah.ogg | ||
| - type: MeleeWeapon | ||
| soundHit: | ||
| path: /Audio/Effects/hallelujah.ogg | ||
| - type: Sprite | ||
| sprite: _NF/Objects/Fun/foxplushie.rsi | ||
| state: holy | ||
| - type: UseDelay | ||
| delay: 2.0 |
16 changes: 16 additions & 0 deletions
16
Resources/Prototypes/Corvax/Entities/Objects/Specific/Robotics/borg_modules.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 |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| - type: entity | ||
| id: BorgModuleWeapon | ||
| parent: [ BaseBorgModule, BaseProviderBorgModule ] | ||
| name: cyborg energy weapon module | ||
| description: Module with an energy dagger and an advanced laser pistol for a cyborg. | ||
| components: | ||
| - type: Sprite | ||
| layers: | ||
| - state: syndicate | ||
| - state: icon-syndicate | ||
| - type: ItemBorgModule | ||
| items: | ||
| - WeaponAdvancedLaser | ||
| - EnergyDagger | ||
| - type: StaticPrice | ||
| vendPrice: 25000 |
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
25 changes: 24 additions & 1 deletion
25
Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contravend.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,6 +1,29 @@ | ||
| - type: vendingMachineInventory | ||
| id: ContraVendInventory | ||
| startingInventory: | ||
| CigPackSyndicate: 8 | ||
| Stimpack: 6 | ||
| StimkitFilled: 4 | ||
| SyndicateJawsOfLife: 4 | ||
| ToolboxSyndicateFilled: 4 | ||
| RadioJammer: 8 | ||
| PowerSink: 2 | ||
| BoxEncryptionKeySyndie: 8 | ||
| AgentIDCard: 8 | ||
| StealthBox: 6 | ||
| ClothingMaskGasVoiceChameleon: 6 | ||
| ClothingBackpackChameleonFill: 4 | ||
| HypopenBox: 4 | ||
| Emag: 2 | ||
| StorageImplanter: 4 | ||
| ClothingShoesBootsMagSyndie: 4 | ||
| ClothingShoesChameleonNoSlips: 8 | ||
| ClothingBackpackDuffelSyndicateEVABundle: 12 | ||
| BoxHoloparasite: 2 | ||
| VestineChemistryVial: 2 | ||
| HoverbikeSyndicateFlatpack: 3 | ||
| SpaceBladeContra: 1 | ||
| BorgModuleWeapon: 3 # Corvax-Frontier | ||
| CrateSyndicateSurplusBundle: 1 | ||
| emaggedInventory: | ||
| CrateSyndicateLightSurplusBundle: 1 | ||
| CrateSyndicateLightSurplusBundle: 1 |
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
65 changes: 34 additions & 31 deletions
65
Resources/Textures/_NF/Objects/Fun/foxplushie.rsi/meta.json
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,38 +1,41 @@ | ||
| { | ||
| "version": 1, | ||
| "license": "CC-BY-SA-3.0", | ||
| "copyright": "Taken from Paradise (toy.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2", | ||
| "copyright": "Taken from Paradise (toy.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2, Holy fox created by FireFoxPhoenix", | ||
| "size": { | ||
| "x": 32, | ||
| "y": 32 | ||
| }, | ||
| "states": [ | ||
| { | ||
| "name": "black" | ||
| }, | ||
| { | ||
| "name": "blue" | ||
| }, | ||
| { | ||
| "name": "coffee" | ||
| }, | ||
| { | ||
| "name": "crimson" | ||
| }, | ||
| { | ||
| "name": "marble" | ||
| }, | ||
| { | ||
| "name": "orange" | ||
| }, | ||
| { | ||
| "name": "pink" | ||
| }, | ||
| { | ||
| "name": "purple" | ||
| }, | ||
| { | ||
| "name": "red" | ||
| } | ||
| ] | ||
| } | ||
| "states": [ | ||
| { | ||
| "name": "black" | ||
| }, | ||
| { | ||
| "name": "blue" | ||
| }, | ||
| { | ||
| "name": "coffee" | ||
| }, | ||
| { | ||
| "name": "crimson" | ||
| }, | ||
| { | ||
| "name": "marble" | ||
| }, | ||
| { | ||
| "name": "orange" | ||
| }, | ||
| { | ||
| "name": "pink" | ||
| }, | ||
| { | ||
| "name": "purple" | ||
| }, | ||
| { | ||
| "name": "red" | ||
| }, | ||
| { | ||
| "name": "holy" | ||
| } | ||
| ] | ||
| } |