diff --git a/Resources/Audio/_NF/Animals/cat_meow_mistake1.ogg b/Resources/Audio/_NF/Animals/cat_meow_mistake1.ogg new file mode 100644 index 00000000000..c51471ca612 Binary files /dev/null and b/Resources/Audio/_NF/Animals/cat_meow_mistake1.ogg differ diff --git a/Resources/Audio/_NF/Animals/cat_meow_mistake2.ogg b/Resources/Audio/_NF/Animals/cat_meow_mistake2.ogg new file mode 100644 index 00000000000..966d69bbdc7 Binary files /dev/null and b/Resources/Audio/_NF/Animals/cat_meow_mistake2.ogg differ diff --git a/Resources/Audio/_NF/Animals/cat_meow_mistake3.ogg b/Resources/Audio/_NF/Animals/cat_meow_mistake3.ogg new file mode 100644 index 00000000000..b88c849dd5a Binary files /dev/null and b/Resources/Audio/_NF/Animals/cat_meow_mistake3.ogg differ diff --git a/Resources/Locale/en-US/_NF/accent/accents.ftl b/Resources/Locale/en-US/_NF/accent/accents.ftl index 941b65b164d..28d87ac9a1f 100644 --- a/Resources/Locale/en-US/_NF/accent/accents.ftl +++ b/Resources/Locale/en-US/_NF/accent/accents.ftl @@ -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. \ No newline at end of file +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. \ No newline at end of file diff --git a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl index e4899806192..83d6fa6ed4c 100644 --- a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl @@ -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. \ No newline at end of file diff --git a/Resources/Locale/en-US/_NF/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/_NF/interaction/interaction-popup-component.ftl new file mode 100644 index 00000000000..439d1cf1135 --- /dev/null +++ b/Resources/Locale/en-US/_NF/interaction/interaction-popup-component.ftl @@ -0,0 +1,3 @@ +## Petting animals + +petting-failure-mistake = Ymg' reach yog l' pet {THE($target)}, mgng ahlloig vulgtmnahor ot h'. diff --git a/Resources/Prototypes/_NF/Accents/full_replacements.yml b/Resources/Prototypes/_NF/Accents/full_replacements.yml index 049a8d1184d..7902e035b4b 100644 --- a/Resources/Prototypes/_NF/Accents/full_replacements.yml +++ b/Resources/Prototypes/_NF/Accents/full_replacements.yml @@ -9,4 +9,15 @@ - accent-words-pirate-cat-4 - accent-words-pirate-cat-5 - accent-words-pirate-cat-6 - - accent-words-pirate-cat-7 \ No newline at end of file + - 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 diff --git a/Resources/Prototypes/_NF/Datasets/Names/cat_mistake.yml b/Resources/Prototypes/_NF/Datasets/Names/cat_mistake.yml new file mode 100644 index 00000000000..2b7545f445d --- /dev/null +++ b/Resources/Prototypes/_NF/Datasets/Names/cat_mistake.yml @@ -0,0 +1,7 @@ +- type: dataset + id: names_cat_mistake + values: +# - SCP-PY-106 + - ???? + - ????? + - ?????? \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml index 251a39006c6..1735ff842ea 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml @@ -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 diff --git a/Resources/Prototypes/_NF/InventoryTemplates/mistake_inventory_template.yml b/Resources/Prototypes/_NF/InventoryTemplates/mistake_inventory_template.yml new file mode 100644 index 00000000000..c15f646b6e8 --- /dev/null +++ b/Resources/Prototypes/_NF/InventoryTemplates/mistake_inventory_template.yml @@ -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 diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml index ab4dc259f43..11f665abe7c 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml @@ -14,3 +14,8 @@ equipment: # ears: ClothingHeadsetService id: AgentIDCard + +- type: startingGear + id: MobMistakeGear + equipment: + id: PassengerIDCard diff --git a/Resources/Prototypes/_NF/SoundCollections/catmistake.yml b/Resources/Prototypes/_NF/SoundCollections/catmistake.yml new file mode 100644 index 00000000000..ff9581061bb --- /dev/null +++ b/Resources/Prototypes/_NF/SoundCollections/catmistake.yml @@ -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 diff --git a/Resources/Prototypes/_NF/Voice/speech_emote_sounds.yml b/Resources/Prototypes/_NF/Voice/speech_emote_sounds.yml index cf48d7f4c66..29dca329596 100644 --- a/Resources/Prototypes/_NF/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/_NF/Voice/speech_emote_sounds.yml @@ -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: diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json index 6f24dc4fc1b..43710140ab8 100644 --- a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json +++ b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json @@ -43,6 +43,24 @@ ] ] }, + { + "name": "mistakecat", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, { "name": "mailcat_dead", "delays": [ @@ -59,6 +77,14 @@ ] ] }, + { + "name": "mistakecat_dead", + "delays": [ + [ + 1 + ] + ] + }, { "name": "cat_deadcollar", "delays": [ @@ -97,6 +123,17 @@ ] ] }, + { + "name": "mistakecat_rest", + "delays": [ + [ + 0.1, + 0.2, + 0.1, + 0.2 + ] + ] + }, { "name": "cat_restcollar", "delays": [ @@ -129,6 +166,14 @@ ] ] }, + { + "name": "mistakecat_sit", + "delays": [ + [ + 1 + ] + ] + }, { "name": "catcollar", "directions": 4, diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/mistakecat.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/mistakecat.png new file mode 100644 index 00000000000..eed27661668 Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/mistakecat.png differ diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/mistakecat_dead.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/mistakecat_dead.png new file mode 100644 index 00000000000..ff40be3e0ff Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/mistakecat_dead.png differ diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/mistakecat_rest.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/mistakecat_rest.png new file mode 100644 index 00000000000..87522a11204 Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/mistakecat_rest.png differ diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/mistakecat_sit.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/mistakecat_sit.png new file mode 100644 index 00000000000..0a154bd5288 Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/mistakecat_sit.png differ