Skip to content

Commit

Permalink
Clippy! (#2487)
Browse files Browse the repository at this point in the history
* 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
Unkn0wnGh0st333 authored Jan 2, 2025
1 parent 66b16af commit 8fda187
Show file tree
Hide file tree
Showing 46 changed files with 514 additions and 42 deletions.
11 changes: 11 additions & 0 deletions Content.Shared/_NF/Clothing/Components/CatWearableComponent.cs
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
{

}
24 changes: 24 additions & 0 deletions Resources/Audio/_NF/Animals/attributions.yml
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 added Resources/Audio/_NF/Animals/cat_meow_mistake1.ogg
Binary file not shown.
Binary file added Resources/Audio/_NF/Animals/cat_meow_mistake2.ogg
Binary file not shown.
Binary file added Resources/Audio/_NF/Animals/cat_meow_mistake3.ogg
Binary file not shown.
Binary file added Resources/Audio/_NF/Animals/nfsdcat_meow.ogg
Binary file not shown.
Binary file added Resources/Audio/_NF/Animals/nfsdcat_meow2.ogg
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,5 @@ ghost-role-information-syndicate-refugee-rules = You're a regular crewmember fro
ghost-role-information-shadow-cat-name = Shadow Cat
ghost-role-information-shadow-cat-description = A cute cat made of... shadows? How?!
ghost-role-information-deltav-clippy-description = The courier's loyal pet, smells like cardboard and papers.
1 change: 1 addition & 0 deletions Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ loadout-group-courier-neck = Courier neck
loadout-group-courier-jumpsuit = Courier jumpsuit
loadout-group-courier-shoes = Courier shoes
loadout-group-courier-outerclothing = Courier outer clothing
loadout-group-courier-backpack = Courier backpack
loadout-group-courier-id = Courier ID
loadout-group-mail-carrier-head = Mail Carrier head
Expand Down
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/_NF/ghost/ghost-role-component.ftl
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.
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
- state: ai
- type: ConditionalSpawner
prototypes:
- MobBingus
- MobBingusGhost # DeltaV - Frontier Feature

- type: entity
name: Space Cat Spawner
Expand Down
14 changes: 11 additions & 3 deletions Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@

- type: entity
name: Runtime
parent: MobCat
parent: MobCatGhost # DeltaV - Frontier Feature
id: MobCatRuntime
description: Professional mouse hunter. Escape artist.
components:
Expand All @@ -143,6 +143,10 @@
attributes:
proper: true
gender: female
- type: Butcherable # DeltaV - Frontier Feature
spawned:
- id: FoodMeatCat
amount: 1
- type: Tag
tags:
- CannotSuicide
Expand All @@ -153,7 +157,7 @@
- type: entity
name: Exception
id: MobCatException
parent: MobCatCalico
parent: MobCatCalicoGhost # DeltaV - Frontier Feature
description: Ask nicely, and maybe they'll give you one of their spare lives.
components:
- type: NpcFactionMember
Expand All @@ -164,6 +168,10 @@
attributes:
proper: true
gender: male
- type: Butcherable # DeltaV - Frontier Feature
spawned:
- id: FoodMeatCat
amount: 1
- type: Tag
tags:
- CannotSuicide
Expand All @@ -174,7 +182,7 @@
- type: entity
name: Floppa
id: MobCatFloppa
parent: MobCatCaracal
parent: MobCatCaracalGhost # DeltaV - Frontier Feature
description: He out here.
components:
- type: Fixtures
Expand Down
11 changes: 0 additions & 11 deletions Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
- type: entity
parent: ClothingHeadBase
id: ClothingHeadMailCarrier
name: mail carrier's hat
description: Smells like a good pension.
components:
- type: Sprite
sprite: Nyanotrasen/Clothing/Head/Hats/mailman.rsi
- type: Clothing
sprite: Nyanotrasen/Clothing/Head/Hats/mailman.rsi

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHoodMysta
Expand Down
11 changes: 11 additions & 0 deletions Resources/Prototypes/_DV/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -215,3 +215,14 @@
- type: Clothing
sprite: _DV/Clothing/Head/Hats/cj_toque.rsi

- type: entity
parent: ClothingHeadBase
id: ClothingHeadMailCarrier
name: mail carrier's hat
description: Smells like a good pension.
components:
- type: Sprite
sprite: _DV/Clothing/Head/Hats/mailman.rsi
- type: Clothing
sprite: _DV/Clothing/Head/Hats/mailman.rsi
- type: CatWearable # Frontier/Delta V
12 changes: 12 additions & 0 deletions Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/courier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,18 @@
equipment:
jumpsuit: ClothingUniformSkirtCourier

# Backpack
- type: loadout
id: ClothingBackpackClippy
equipment:
back: ClothingBackpackClippy
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:RoleTimeRequirement
role: JobCourier
time: 54000 #15 hrs

# Shoes
- type: loadout
id: RollerSkates
Expand Down
9 changes: 9 additions & 0 deletions Resources/Prototypes/_DV/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,15 @@
- CargoTechnicianWintercoat
- MailCarrierWintercoat

- type: loadoutGroup
id: CourierBackpack
name: loadout-group-courier-backpack
loadouts:
- CargoTechnicianBackpack
- CargoTechnicianSatchel
- CargoTechnicianDuffel
- ClothingBackpackClippy

- type: loadoutGroup
id: CourierShoes
name: loadout-group-courier-shoes
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_DV/Loadouts/role_loadouts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
- CourierJumpsuit
- CourierOuterClothing
- CourierPDA
- CargoTechnicianBackpack
- CourierBackpack
- CourierShoes
- Survival
- Trinkets
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/_NF/Datasets/Names/cat_clippy.yml
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 Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.yml
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
20 changes: 20 additions & 0 deletions Resources/Prototypes/_NF/Entities/Debugging/tippy.yml
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
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
43 changes: 43 additions & 0 deletions Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml
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
Loading

0 comments on commit 8fda187

Please sign in to comment.