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

???? #511

Merged
merged 1 commit into from
Oct 30, 2023
Merged

???? #511

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.
11 changes: 10 additions & 1 deletion Resources/Locale/en-US/_NF/accent/accents.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,13 @@ accent-words-pirate-cat-3 = Mrrrrrrow!
accent-words-pirate-cat-4 = Arrgh Hhsss!
accent-words-pirate-cat-5 = Brrrrrow.
accent-words-pirate-cat-6 = Yarrgh Meow?
accent-words-pirate-cat-7 = Garr Miau.
accent-words-pirate-cat-7 = Garr Miau.

# Mistake cat accent
accent-words-mistake-cat-1 = Hafh ya.
accent-words-mistake-cat-2 = Ahh Y' ah like fahf.
accent-words-mistake-cat-3 = ya lw'nafh ph' ah.
accent-words-mistake-cat-4 = Y' ahor h' mggoka'ai.
accent-words-mistake-cat-5 = Y' cant ah'ehye bug.
accent-words-mistake-cat-6 = li h' nilgh'ri ngahnah.
accent-words-mistake-cat-7 = ymg' mgep l' ah'n'gha ya.
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@ ghost-role-information-clippy-description = The Station Representative loyal wor

ghost-role-information-clarpy-name = Clarpy
ghost-role-information-clarpy-description = Avast ye mail! wanted by Nanotrasen for crimes against mice.

ghost-role-information-mistake-name = ?????
ghost-role-information-mistake-description = Ymg' ph'nglui ah li.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## Petting animals

petting-failure-mistake = Ymg' reach yog l' pet {THE($target)}, mgng ahlloig vulgtmnahor ot h'.
13 changes: 12 additions & 1 deletion Resources/Prototypes/_NF/Accents/full_replacements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,15 @@
- accent-words-pirate-cat-4
- accent-words-pirate-cat-5
- accent-words-pirate-cat-6
- accent-words-pirate-cat-7
- accent-words-pirate-cat-7

- type: accent
id: mistakeCat
fullReplacements:
- accent-words-mistake-cat-1
- accent-words-mistake-cat-2
- accent-words-mistake-cat-3
- accent-words-mistake-cat-4
- accent-words-mistake-cat-5
- accent-words-mistake-cat-6
- accent-words-mistake-cat-7
7 changes: 7 additions & 0 deletions Resources/Prototypes/_NF/Datasets/Names/cat_mistake.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
- type: dataset
id: names_cat_mistake
values:
# - SCP-PY-106
- ????
- ?????
- ??????
46 changes: 46 additions & 0 deletions Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,49 @@
implants:
- DeathRattleImplant

- type: entity
name: Mistake
parent: MobCatGhost
id: MobCatMistake
description: ???
components:
- type: Sprite
drawdepth: Mobs
sprite: _NF/Mobs/Pets/cat.rsi
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: mistakecat
- type: DamageStateVisuals
states:
Alive:
Base: mistakecat
Critical:
Base: mistakecat_dead
Dead:
Base: mistakecat_dead
- type: GhostRole
name: ghost-role-information-mistake-name
description: ghost-role-information-mistake-description
makeSentient: true
allowSpeech: true
allowMovement: true
- type: Inventory
speciesId: cat
templateId: mistake
- type: Loadout
prototypes: [ MobMistakeGear ]
- type: ReplacementAccent
accent: mistakeCat
- type: RandomMetadata
nameSegments: [names_cat_mistake] # Its needed to fix the names since it was using the MobCatGhost list.
- type: Vocal
sounds:
Male: CatMistake
Female: CatMistake
Unsexed: CatMistake
- type: InteractionPopup
successChance: 0.0
interactFailureString: petting-failure-mistake
- type: MovementSpeedModifier
baseWalkSpeed : 8
baseSprintSpeed : 8
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
- type: inventoryTemplate
id: mistake
slots:
# - name: ears
# slotTexture: ears
# slotFlags: EARS
# slotGroup: MainHotbar
# stripTime: 3
# uiWindowPos: 1,2
# strippingWindowPos: 1,2
# displayName: Ears
# whitelist:
# tags:
# - PetWearableCat

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

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

- name: id
slotTexture: id
slotFlags: IDCARD
slotGroup: SecondHotbar
stripTime: 6
uiWindowPos: 2,1
strippingWindowPos: 2,4
displayName: ID
5 changes: 5 additions & 0 deletions Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,8 @@
equipment:
# ears: ClothingHeadsetService
id: AgentIDCard

- type: startingGear
id: MobMistakeGear
equipment:
id: PassengerIDCard
6 changes: 6 additions & 0 deletions Resources/Prototypes/_NF/SoundCollections/catmistake.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- type: soundCollection
id: CatMistake
files:
- /Audio/_NF/Animals/cat_meow_mistake1.ogg
- /Audio/_NF/Animals/cat_meow_mistake2.ogg
- /Audio/_NF/Animals/cat_meow_mistake3.ogg
8 changes: 8 additions & 0 deletions Resources/Prototypes/_NF/Voice/speech_emote_sounds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,14 @@
params:
variation: 0.125

- type: emoteSounds
id: CatMistake
params:
variation: 0.125
sounds:
Scream:
collection: CatMistake

- type: emoteSounds
id: Dog
sound:
Expand Down
45 changes: 45 additions & 0 deletions Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,24 @@
]
]
},
{
"name": "mistakecat",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "mailcat_dead",
"delays": [
Expand All @@ -59,6 +77,14 @@
]
]
},
{
"name": "mistakecat_dead",
"delays": [
[
1
]
]
},
{
"name": "cat_deadcollar",
"delays": [
Expand Down Expand Up @@ -97,6 +123,17 @@
]
]
},
{
"name": "mistakecat_rest",
"delays": [
[
0.1,
0.2,
0.1,
0.2
]
]
},
{
"name": "cat_restcollar",
"delays": [
Expand Down Expand Up @@ -129,6 +166,14 @@
]
]
},
{
"name": "mistakecat_sit",
"delays": [
[
1
]
]
},
{
"name": "catcollar",
"directions": 4,
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading