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

Clippy! #2487

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open
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
{

}
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.
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.
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,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
12 changes: 12 additions & 0 deletions Resources/Prototypes/DeltaV/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/DeltaV/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/DeltaV/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
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
sprite: Nyanotrasen/Clothing/Head/Hats/mailman.rsi
- type: Clothing
sprite: Nyanotrasen/Clothing/Head/Hats/mailman.rsi
- type: Tag # DeltaV
tags: # DeltV
- ClothMade # DeltaV
- WhitelistChameleon # DeltaV
- CatWearable # Frontier
Unkn0wnGh0st333 marked this conversation as resolved.
Show resolved Hide resolved

- type: entity
parent: ClothingHeadBase
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: NFClothingBackpack
Unkn0wnGh0st333 marked this conversation as resolved.
Show resolved Hide resolved
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
- type: entity
parent: [ ClothingBackpack,] # DeltaV - Comment out NFBackpackHiddenStash
id: NFClothingBackpack
components:
- type: Storage
maxItemSize: Large
defaultStorageOrientation: Vertical
grid:
- 0,0,6,3
- type: Item
size: Huge
shape:
- 0,0,6,3
Unkn0wnGh0st333 marked this conversation as resolved.
Show resolved Hide resolved
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,64 @@
- 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
Unkn0wnGh0st333 marked this conversation as resolved.
Show resolved Hide resolved
- 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
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
Unkn0wnGh0st333 marked this conversation as resolved.
Show resolved Hide resolved
- 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
Unkn0wnGh0st333 marked this conversation as resolved.
Show resolved Hide resolved
- 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 # DeltaV - Comment Out
# - type: IntrinsicRadioTransmitter # DeltaV - Comment out Radio Channels
# channels:
# - Service
# - type: ActiveRadio
# channels:
# - Service
- type: NpcFactionMember
factions:
- Cat
- PetsNT
- type: ShowJobIcons
12 changes: 12 additions & 0 deletions Resources/Prototypes/_NF/Entities/Spawners/mobs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
- type: entity
name: Clippy Spawner
id: SpawnMobCatClippy
parent: MarkerBase
components:
- type: Sprite
layers:
- state: green
- state: ai
- type: ConditionalSpawner
prototypes:
- MobCatClippy
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
- type: inventoryTemplate
id: nfcat
slots:
- name: head
slotTexture: head
slotFlags: HEAD
slotGroup: MainHotbar
uiWindowPos: 0,0
strippingWindowPos: 0,0
displayName: Head
whitelist:
components:
- CatWearable
Unkn0wnGh0st333 marked this conversation as resolved.
Show resolved Hide resolved

- name: mask
slotTexture: mask
slotFlags: MASK
uiWindowPos: 1,1
strippingWindowPos: 1,1
displayName: Mask
whitelist:
tags:
- PetWearable
components:
- CatWearable

- name: suitstorage
slotTexture: suit_storage
slotFlags: SUITSTORAGE
slotGroup: SecondHotbar
stripTime: 3
uiWindowPos: 2,0
strippingWindowPos: 2,5
displayName: Suit Storage
whitelist:
components:
- GasTank

- name: belt
slotTexture: belt
slotFlags: BELT
slotGroup: SecondHotbar
stripTime: 1
uiWindowPos: 3,1
strippingWindowPos: 1,5
displayName: Belt
whitelist:
components:
- CatWearable

- name: outerClothing
slotTexture: suit
slotFlags: OUTERCLOTHING
stripTime: 6
uiWindowPos: 1,1
strippingWindowPos: 1,2
displayName: Suit
whitelist:
components:
- CatWearable

- name: id
slotTexture: id
slotFlags: IDCARD
slotGroup: SecondHotbar
stripTime: 6
uiWindowPos: 2,1
strippingWindowPos: 2,4
displayName: ID
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
- type: inventoryTemplate
id: nfpet
slots:
- name: mask
slotTexture: mask
slotFlags: MASK
uiWindowPos: 1,1
strippingWindowPos: 1,1
displayName: Mask
whitelist:
tags:
- PetWearable
7 changes: 7 additions & 0 deletions Resources/Prototypes/_NF/Roles/Ghostroles/whitelisted.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
- type: ghostRole
id: CatClippy
name: ghost-role-information-clippy-name
description: ghost-role-information-clippy-description
rules: ghost-role-information-emotional-support-rules
entityPrototype: MobCatClippy
whitelisted: false # DeltaV - Change True>False
21 changes: 21 additions & 0 deletions Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Aghost
- type: startingGear
id: NFMobAghostGear
equipment:
back: ClothingBackpackSatchelHolding
id: NFAdminPDA
Unkn0wnGh0st333 marked this conversation as resolved.
Show resolved Hide resolved
storage:
back:
- GasAnalyzer
- trayScanner
- AccessConfiguratorUniversal
- Multitool
- PowerDrill
- JawsOfLife
- WelderIndustrialAdvanced

- type: startingGear
id: MobClippyGear
equipment:
head: ClothingHeadMailCarrier
# id: ClippyIDCard # DeltaV - Commented out
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading