-
Notifications
You must be signed in to change notification settings - Fork 352
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Clippy! (Broken) * Tag to Comp * Cat Meat * Small Patches that lyndo was crying about * Yaml Fix? * Cat Emote Sounds and Stuff * Another prototype fix * Dvir001 fixes * Hopefully last fix * Dvir001 fixes part 2 * Move Mailman hat to DeltaV * Yaml Fix * clean up and refactor --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
- Loading branch information
1 parent
66b16af
commit 8fda187
Showing
46 changed files
with
514 additions
and
42 deletions.
There are no files selected for viewing
11 changes: 11 additions & 0 deletions
11
Content.Shared/_NF/Clothing/Components/CatWearableComponent.cs
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,11 @@ | ||
using Robust.Shared.GameStates; | ||
|
||
namespace Content.Shared._NF.Clothing.Components; | ||
/// <summary> | ||
/// Replace tag for frontier use | ||
/// </summary> | ||
[RegisterComponent, NetworkedComponent] | ||
public sealed partial class CatWearableComponent : Component | ||
{ | ||
|
||
} |
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,24 @@ | ||
- files: ["cat_meow_mistake1.ogg"] | ||
license: "CC0-1.0" | ||
copyright: "Modified by 'dvir001' from few sounds from 'pixabay'. The original audio was trimmed, mixed, split to mono, and converted from WAV to OGG format" | ||
source: "https://pixabay.com/sound-effects/" | ||
|
||
- files: ["cat_meow_mistake2.ogg"] | ||
license: "CC0-1.0" | ||
copyright: "Modified by 'dvir001' from few sounds from 'pixabay'. The original audio was trimmed, mixed, split to mono, and converted from WAV to OGG format" | ||
source: "https://pixabay.com/sound-effects/" | ||
|
||
- files: ["cat_meow_mistake3.ogg"] | ||
license: "CC0-1.0" | ||
copyright: "Modified by 'dvir001' from few sounds from 'pixabay'. The original audio was trimmed, mixed, split to mono, and converted from WAV to OGG format" | ||
source: "https://pixabay.com/sound-effects/" | ||
|
||
- files: ["nfsdcat_meow.ogg"] | ||
license: "CC-BY-4.0" | ||
copyright: "Audio is recorded/created by 'salvantrix' for Frontier" | ||
source: "https://github.com/new-frontiers-14/frontier-station-14/" | ||
|
||
- files: ["nfsdcat_meow2.ogg"] | ||
license: "CC-BY-4.0" | ||
copyright: "Audio is recorded/created by 'salvantrix' for Frontier" | ||
source: "https://github.com/new-frontiers-14/frontier-station-14/" |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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,2 @@ | ||
ghost-role-information-clippy-name = Clippy | ||
ghost-role-information-clippy-description = The Station Representative's loyal worker, smells like cardboard and papers. |
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
11 changes: 0 additions & 11 deletions
11
Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
- type: dataset | ||
id: names_cat_clippy | ||
values: | ||
- Clippy |
11 changes: 11 additions & 0 deletions
11
Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.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,11 @@ | ||
- type: entity | ||
parent: ClothingBackpack # DeltaV - NFClothingBackpack > ClothingBackpack | ||
id: ClothingBackpackClippy | ||
name: Clippy's backpack | ||
description: Made from a real Clippy. | ||
components: | ||
- type: Sprite | ||
sprite: _NF/Clothing/Back/Backpacks/clippy.rsi | ||
- type: Storage | ||
storageOpenSound: | ||
collection: CatMeows |
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,20 @@ | ||
- type: entity | ||
id: NFTippy | ||
parent: Tippy | ||
categories: [ HideSpawnMenu ] | ||
components: | ||
- type: Sprite | ||
layers: | ||
- sprite: _NF/Tips/clippy.rsi | ||
state: left | ||
map: [ "revealing" ] | ||
- sprite: _NF/Tips/clippy.rsi | ||
state: right | ||
map: [ "hiding" ] | ||
- sprite: _NF/Tips/clippy.rsi | ||
state: down | ||
visible: false | ||
map: [ "speaking" ] | ||
- type: FootstepModifier | ||
footstepSoundCollection: | ||
collection: CatMeows |
116 changes: 116 additions & 0 deletions
116
Resources/Prototypes/_NF/Entities/Mobs/NPCs/emotionalsupportanimals.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,116 @@ | ||
- type: entity | ||
id: BaseEmotionalGhost | ||
abstract: true | ||
components: | ||
- type: GhostTakeoverAvailable | ||
- type: GhostRole | ||
name: ghost-role-information-emotional-support-name | ||
description: ghost-role-information-emotional-support-description | ||
rules: ghost-role-information-emotional-support-rules | ||
makeSentient: true | ||
allowSpeech: true | ||
allowMovement: true | ||
# prototype: EmotionalSupportPet | ||
- type: Grammar | ||
attributes: | ||
proper: true | ||
gender: epicene | ||
- type: IdExaminable | ||
- type: InventorySlots | ||
- type: Strippable | ||
- type: UserInterface | ||
interfaces: | ||
enum.StrippingUiKey.Key: | ||
type: StrippableBoundUserInterface | ||
- type: Tag | ||
tags: | ||
- CannotSuicide | ||
- DoorBumpOpener | ||
- VimPilot | ||
- type: Puller | ||
needsHands: false | ||
- type: Inventory | ||
templateId: nfpet | ||
|
||
- type: entity | ||
id: BaseEmotionalGhostCat | ||
parent: BaseEmotionalGhost | ||
abstract: true | ||
components: | ||
- type: ReplacementAccent | ||
accent: cat | ||
- type: Vocal | ||
sounds: | ||
Male: Cat | ||
Female: Cat | ||
Unsexed: Cat | ||
- type: Inventory | ||
templateId: nfcat | ||
speciesId: cat | ||
- type: RotationVisuals | ||
defaultRotation: 90 | ||
horizontalRotation: 90 | ||
|
||
- type: entity | ||
suffix: Ghost | ||
parent: [BaseEmotionalGhostCat, MobCat] | ||
id: MobCatGhost | ||
components: | ||
- type: RandomMetadata | ||
nameSegments: [names_cat] | ||
- type: DamageStateVisuals | ||
states: | ||
Alive: | ||
Base: cat | ||
|
||
- type: entity | ||
suffix: Ghost | ||
parent: [BaseEmotionalGhostCat, MobCatCalico] | ||
id: MobCatCalicoGhost | ||
components: | ||
- type: RandomMetadata | ||
nameSegments: [names_cat_calico] | ||
- type: DamageStateVisuals | ||
states: | ||
Alive: | ||
Base: cat2 | ||
|
||
- type: entity | ||
suffix: Ghost | ||
parent: [BaseEmotionalGhostCat, MobBingus] | ||
id: MobBingusGhost | ||
components: | ||
- type: RandomMetadata | ||
nameSegments: [names_cat_bingus] | ||
- type: DamageStateVisuals | ||
states: | ||
Alive: | ||
Base: bingus | ||
|
||
- type: entity | ||
suffix: Ghost | ||
parent: [BaseEmotionalGhostCat, MobCatCaracal] | ||
id: MobCatCaracalGhost | ||
components: | ||
- type: RandomMetadata | ||
nameSegments: [names_cat_caracal] | ||
- type: DamageStateVisuals | ||
states: | ||
Alive: | ||
Base: caracal_flop | ||
- type: Inventory # Broken hats | ||
templateId: nfpet # Broken hats | ||
|
||
- type: entity | ||
suffix: Ghost | ||
parent: [BaseEmotionalGhostCat, MobCatSpace] | ||
id: MobCatSpaceGhost | ||
components: | ||
- type: RandomMetadata | ||
nameSegments: [names_cat_space] | ||
- type: DamageStateVisuals | ||
states: | ||
Alive: | ||
Base: spacecat | ||
- type: Inventory # Broken hats | ||
templateId: nfpet # Broken hats |
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,43 @@ | ||
- type: entity | ||
id: NFMobPet | ||
abstract: true | ||
components: | ||
- type: GhostRole | ||
# - type: IntrinsicRadioReceiver # DeltaV - comment out | ||
- type: CargoSellBlacklist | ||
|
||
- type: entity | ||
name: Clippy | ||
parent: [NFMobPet, MobCatGhost] | ||
id: MobCatClippy | ||
description: It looks like you’re writing a letter, would you like help? | ||
components: | ||
- type: GhostRole | ||
name: ghost-role-information-clippy-name | ||
description: ghost-role-information-deltav-clippy-description # DeltaV - Alternate Description | ||
rules: ghost-role-information-nonantagonist-rules | ||
# prototype: CatClippy # DeltaV - Comment out | ||
- type: Loadout | ||
prototypes: [ MobClippyGear ] | ||
- type: RandomMetadata | ||
nameSegments: [names_cat_clippy] | ||
# - type: AutoImplant # DeltaV - Comment out Implants | ||
# implants: | ||
# - MindShieldImplant | ||
# - MedicalTrackingImplant | ||
- type: Butcherable | ||
spawned: | ||
- id: FoodMeatCat | ||
amount: 1 | ||
# - id: MaterialHideClippy | ||
# - type: IntrinsicRadioTransmitter # DeltaV - Comment out Radio Channels | ||
# channels: | ||
# - Service | ||
# - type: ActiveRadio | ||
# channels: | ||
# - Service | ||
- type: NpcFactionMember | ||
factions: | ||
- Cat | ||
- PetsNT | ||
# - type: ShowJobIcons # DeltaV - Comment out |
Oops, something went wrong.