diff --git a/Content.Shared/_NF/Clothing/Components/CatWearableComponent.cs b/Content.Shared/_NF/Clothing/Components/CatWearableComponent.cs new file mode 100644 index 00000000000..d9a4a4cd956 --- /dev/null +++ b/Content.Shared/_NF/Clothing/Components/CatWearableComponent.cs @@ -0,0 +1,11 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._NF.Clothing.Components; +/// +/// Replace tag for frontier use +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class CatWearableComponent : Component +{ + +} diff --git a/Resources/Audio/_NF/Animals/attributions.yml b/Resources/Audio/_NF/Animals/attributions.yml new file mode 100644 index 00000000000..3a107de838b --- /dev/null +++ b/Resources/Audio/_NF/Animals/attributions.yml @@ -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/" 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/Audio/_NF/Animals/nfsdcat_meow.ogg b/Resources/Audio/_NF/Animals/nfsdcat_meow.ogg new file mode 100644 index 00000000000..f8db6248751 Binary files /dev/null and b/Resources/Audio/_NF/Animals/nfsdcat_meow.ogg differ diff --git a/Resources/Audio/_NF/Animals/nfsdcat_meow2.ogg b/Resources/Audio/_NF/Animals/nfsdcat_meow2.ogg new file mode 100644 index 00000000000..77277b7dd79 Binary files /dev/null and b/Resources/Audio/_NF/Animals/nfsdcat_meow2.ogg differ diff --git a/Resources/Locale/en-US/_DV/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/_DV/ghost/roles/ghost-role-component.ftl index 9d5452892cd..e9dd33a63e1 100644 --- a/Resources/Locale/en-US/_DV/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/_DV/ghost/roles/ghost-role-component.ftl @@ -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. diff --git a/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl b/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl index a6db234fa36..e75d0aa3f8d 100644 --- a/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl @@ -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 diff --git a/Resources/Locale/en-US/_NF/ghost/ghost-role-component.ftl b/Resources/Locale/en-US/_NF/ghost/ghost-role-component.ftl new file mode 100644 index 00000000000..83e0600d2a6 --- /dev/null +++ b/Resources/Locale/en-US/_NF/ghost/ghost-role-component.ftl @@ -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. diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml index a8fedbb5a21..0eead10c927 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml @@ -175,7 +175,7 @@ - state: ai - type: ConditionalSpawner prototypes: - - MobBingus + - MobBingusGhost # DeltaV - Frontier Feature - type: entity name: Space Cat Spawner diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 930c241ed16..5b12512f752 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -128,7 +128,7 @@ - type: entity name: Runtime - parent: MobCat + parent: MobCatGhost # DeltaV - Frontier Feature id: MobCatRuntime description: Professional mouse hunter. Escape artist. components: @@ -143,6 +143,10 @@ attributes: proper: true gender: female + - type: Butcherable # DeltaV - Frontier Feature + spawned: + - id: FoodMeatCat + amount: 1 - type: Tag tags: - CannotSuicide @@ -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 @@ -164,6 +168,10 @@ attributes: proper: true gender: male + - type: Butcherable # DeltaV - Frontier Feature + spawned: + - id: FoodMeatCat + amount: 1 - type: Tag tags: - CannotSuicide @@ -174,7 +182,7 @@ - type: entity name: Floppa id: MobCatFloppa - parent: MobCatCaracal + parent: MobCatCaracalGhost # DeltaV - Frontier Feature description: He out here. components: - type: Fixtures diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml index 4e03387bc0a..dcfc780b60b 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml @@ -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 diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_DV/Entities/Clothing/Head/hats.yml index 6c80ba3c617..58d1aae176a 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Head/hats.yml @@ -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 diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/courier.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/courier.yml index a01f92d0d9d..3cf896b1e8d 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/courier.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/courier.yml @@ -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 diff --git a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml index 5893a20fd8e..29dde978fe2 100644 --- a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml @@ -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 diff --git a/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml b/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml index 51492e28bda..488f4977ad9 100644 --- a/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml @@ -8,7 +8,7 @@ - CourierJumpsuit - CourierOuterClothing - CourierPDA - - CargoTechnicianBackpack + - CourierBackpack - CourierShoes - Survival - Trinkets diff --git a/Resources/Prototypes/_NF/Datasets/Names/cat_clippy.yml b/Resources/Prototypes/_NF/Datasets/Names/cat_clippy.yml new file mode 100644 index 00000000000..1be9f601480 --- /dev/null +++ b/Resources/Prototypes/_NF/Datasets/Names/cat_clippy.yml @@ -0,0 +1,4 @@ +- type: dataset + id: names_cat_clippy + values: + - Clippy diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.yml new file mode 100644 index 00000000000..1f25eb07ded --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.yml @@ -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 diff --git a/Resources/Prototypes/_NF/Entities/Debugging/tippy.yml b/Resources/Prototypes/_NF/Entities/Debugging/tippy.yml new file mode 100644 index 00000000000..cdc29f42ea4 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Debugging/tippy.yml @@ -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 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/emotionalsupportanimals.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/emotionalsupportanimals.yml new file mode 100644 index 00000000000..9b8886d3ddb --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/emotionalsupportanimals.yml @@ -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 diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml new file mode 100644 index 00000000000..6befeaa936e --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml @@ -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 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meat.yml new file mode 100644 index 00000000000..bda82a7ca92 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meat.yml @@ -0,0 +1,26 @@ +# Raw + +- type: entity + name: prime-cut cat meat + # can't rot since that would be very bad for syndies + parent: FoodMeatBase + id: FoodMeatCat + description: The tainted gift of an evil crime. The meat may be delicious, but at what cost? + components: + - type: Tag + tags: + - Raw + - HighRiskItem + - Meat + - type: Sprite + state: corgi + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Bicaridine + Quantity: 20 + - type: StaticPrice + price: 750 +# - type: StealTarget +# stealGroup: FoodMeatCat diff --git a/Resources/Prototypes/_NF/Entities/Spawners/mobs.yml b/Resources/Prototypes/_NF/Entities/Spawners/mobs.yml new file mode 100644 index 00000000000..c20fb81c007 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Spawners/mobs.yml @@ -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 diff --git a/Resources/Prototypes/_NF/InventoryTemplates/cat_inventory_template.yml b/Resources/Prototypes/_NF/InventoryTemplates/cat_inventory_template.yml new file mode 100644 index 00000000000..b071496f3bd --- /dev/null +++ b/Resources/Prototypes/_NF/InventoryTemplates/cat_inventory_template.yml @@ -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 + + - 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 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/InventoryTemplates/pet_inventory_template.yml b/Resources/Prototypes/_NF/InventoryTemplates/pet_inventory_template.yml new file mode 100644 index 00000000000..8abe4f58a66 --- /dev/null +++ b/Resources/Prototypes/_NF/InventoryTemplates/pet_inventory_template.yml @@ -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 diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml new file mode 100644 index 00000000000..25ee494b797 --- /dev/null +++ b/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml @@ -0,0 +1,5 @@ +- type: startingGear + id: MobClippyGear + equipment: + head: ClothingHeadMailCarrier +# id: ClippyIDCard # DeltaV - Commented out 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 new file mode 100644 index 00000000000..c56d3832fc3 --- /dev/null +++ b/Resources/Prototypes/_NF/Voice/speech_emote_sounds.yml @@ -0,0 +1,21 @@ +- type: emoteSounds + id: Cat + sound: + path: /Audio/Animals/cat_meow.ogg + params: + variation: 0.125 + +- type: emoteSounds + id: NfsdCat + sound: + path: /Audio/_NF/Animals/nfsdcat_meow.ogg + params: + variation: 0.125 + +- type: emoteSounds + id: CatMistake + params: + variation: 0.125 + sounds: + Scream: + collection: CatMistake diff --git a/Resources/Prototypes/_NF/Voice/speech_sounds.yml b/Resources/Prototypes/_NF/Voice/speech_sounds.yml new file mode 100644 index 00000000000..edf4953bcc0 --- /dev/null +++ b/Resources/Prototypes/_NF/Voice/speech_sounds.yml @@ -0,0 +1,8 @@ +- type: speechSounds + id: NfsdCat + saySound: + path: /Audio/_NF/Animals/nfsdcat_meow2.ogg + askSound: + path: /Audio/_NF/Animals/nfsdcat_meow.ogg + exclaimSound: + path: /Audio/_NF/Animals/nfsdcat_meow.ogg diff --git a/Resources/Textures/Nyanotrasen/Clothing/Head/Hats/mailman.rsi/meta.json b/Resources/Textures/Nyanotrasen/Clothing/Head/Hats/mailman.rsi/meta.json deleted file mode 100644 index e0e8d077364..00000000000 --- a/Resources/Textures/Nyanotrasen/Clothing/Head/Hats/mailman.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-4.0", - "copyright": "@Vordenburg", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-HELMET", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_DV/Clothing/Head/Hats/mailman.rsi/equipped-HELMET-cat.png b/Resources/Textures/_DV/Clothing/Head/Hats/mailman.rsi/equipped-HELMET-cat.png new file mode 100644 index 00000000000..9151fde10bc Binary files /dev/null and b/Resources/Textures/_DV/Clothing/Head/Hats/mailman.rsi/equipped-HELMET-cat.png differ diff --git a/Resources/Textures/Nyanotrasen/Clothing/Head/Hats/mailman.rsi/equipped-HELMET.png b/Resources/Textures/_DV/Clothing/Head/Hats/mailman.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Clothing/Head/Hats/mailman.rsi/equipped-HELMET.png rename to Resources/Textures/_DV/Clothing/Head/Hats/mailman.rsi/equipped-HELMET.png diff --git a/Resources/Textures/Nyanotrasen/Clothing/Head/Hats/mailman.rsi/icon.png b/Resources/Textures/_DV/Clothing/Head/Hats/mailman.rsi/icon.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Clothing/Head/Hats/mailman.rsi/icon.png rename to Resources/Textures/_DV/Clothing/Head/Hats/mailman.rsi/icon.png diff --git a/Resources/Textures/Nyanotrasen/Clothing/Head/Hats/mailman.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Head/Hats/mailman.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Clothing/Head/Hats/mailman.rsi/inhand-left.png rename to Resources/Textures/_DV/Clothing/Head/Hats/mailman.rsi/inhand-left.png diff --git a/Resources/Textures/Nyanotrasen/Clothing/Head/Hats/mailman.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Head/Hats/mailman.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Clothing/Head/Hats/mailman.rsi/inhand-right.png rename to Resources/Textures/_DV/Clothing/Head/Hats/mailman.rsi/inhand-right.png diff --git a/Resources/Textures/_DV/Clothing/Head/Hats/mailman.rsi/meta.json b/Resources/Textures/_DV/Clothing/Head/Hats/mailman.rsi/meta.json new file mode 100644 index 00000000000..2b130716d8b --- /dev/null +++ b/Resources/Textures/_DV/Clothing/Head/Hats/mailman.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "@Vordenburg", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-HELMET-cat", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Back/Backpacks/clippy.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Backpacks/clippy.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..05507b196ec Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Backpacks/clippy.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Backpacks/clippy.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Backpacks/clippy.rsi/icon.png new file mode 100644 index 00000000000..bea19721a99 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Backpacks/clippy.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Backpacks/clippy.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Backpacks/clippy.rsi/inhand-left.png new file mode 100644 index 00000000000..cec88928889 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Backpacks/clippy.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Backpacks/clippy.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Backpacks/clippy.rsi/inhand-right.png new file mode 100644 index 00000000000..774f217630d Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Backpacks/clippy.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Backpacks/clippy.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Backpacks/clippy.rsi/meta.json new file mode 100644 index 00000000000..80aa8ed45d9 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Back/Backpacks/clippy.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by gentlebutter(Discord) for fs14.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Tips/clippy.rsi/down.png b/Resources/Textures/_NF/Tips/clippy.rsi/down.png new file mode 100644 index 00000000000..0c0411f10d3 Binary files /dev/null and b/Resources/Textures/_NF/Tips/clippy.rsi/down.png differ diff --git a/Resources/Textures/_NF/Tips/clippy.rsi/left.png b/Resources/Textures/_NF/Tips/clippy.rsi/left.png new file mode 100644 index 00000000000..573dcb7912e Binary files /dev/null and b/Resources/Textures/_NF/Tips/clippy.rsi/left.png differ diff --git a/Resources/Textures/_NF/Tips/clippy.rsi/meta.json b/Resources/Textures/_NF/Tips/clippy.rsi/meta.json new file mode 100644 index 00000000000..5e14e44c45b --- /dev/null +++ b/Resources/Textures/_NF/Tips/clippy.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Dvir001 on github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "down" + }, + { + "name": "left" + }, + { + "name": "right" + } + ] +} diff --git a/Resources/Textures/_NF/Tips/clippy.rsi/right.png b/Resources/Textures/_NF/Tips/clippy.rsi/right.png new file mode 100644 index 00000000000..2cca72ed897 Binary files /dev/null and b/Resources/Textures/_NF/Tips/clippy.rsi/right.png differ