From b417ea01d6f65dadbcf2db1407a579008b7f872c Mon Sep 17 00:00:00 2001 From: VividPups <68whiskty@gmail.com> Date: Mon, 16 Sep 2024 21:36:58 -0500 Subject: [PATCH 1/9] quack Quack --- .../_NF/ghost/roles/ghost-role-component.ftl | 3 + .../_NF/Entities/Mobs/NPCs/animals.yml | 87 ++++++++++++++++++ .../_NF/Recipes/Cooking/meal_recipes.yml | 13 +++ .../_NF/Mobs/Animals/Banana_duck.rsi/dead.png | Bin 0 -> 4629 bytes .../_NF/Mobs/Animals/Banana_duck.rsi/icon.png | Bin 0 -> 767 bytes .../Mobs/Animals/Banana_duck.rsi/meta.json | 21 +++++ .../Mobs/Animals/Banana_duck.rsi/quack.png | Bin 0 -> 1815 bytes 7 files changed, 124 insertions(+) create mode 100644 Resources/Textures/_NF/Mobs/Animals/Banana_duck.rsi/dead.png create mode 100644 Resources/Textures/_NF/Mobs/Animals/Banana_duck.rsi/icon.png create mode 100644 Resources/Textures/_NF/Mobs/Animals/Banana_duck.rsi/meta.json create mode 100644 Resources/Textures/_NF/Mobs/Animals/Banana_duck.rsi/quack.png 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 7fa9ddf294a..e8f868791a0 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 @@ -36,3 +36,6 @@ ghost-role-information-taxibot-description = Drive passengers to where they need ghost-role-information-hovertaxibot-name = Hovertaxibot ghost-role-information-hovertaxibot-description = Fly passengers to where they need to go, remember to check they can breathe! + +ghost-role-information-BananaDuck-name = Quanana +ghost-role-information-BananaDuck-description = You are the chef's favorite child. You're a living banana duck. diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml index d0e029d0c73..e50bd14b6f7 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml @@ -56,3 +56,90 @@ size: Normal - type: Clothing sprite: _NF/Mobs/Animals/rosy_mothroach.rsi + +- type: entity + name: Quanana + parent: MobDuckMallard + id: MobBananaDuck + description: It's a banana. It's a duck. It's a quanana. + components: + - type: Sprite + noRot: true + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: quack + sprite: _NF/Mobs/Animals/Banana_duck.rsi + scale: 0.7,0.7 + - type: GhostRole + prob: 1 + name: ghost-role-information-BananaDuck-name + allowMovement: true + description: ghost-role-information-BananaDuck-description + rules: ghost-role-information-nonantagonist-rules + - type: GhostTakeoverAvailable + - type: ReproductivePartner + - type: Reproductive + breedChance: 0.10 + birthPopup: reproductive-laid-egg-popup + makeOffspringInfant: false + partnerWhitelist: + tags: + - Duck + offspring: + - id: FoodEggQuananaFertilized + maxAmount: 3 + - type: EggLayer + eggSpawn: + - id: FoodEggQuananaFertilized + - type: ReplacementAccent + accent: duck + - type: DamageStateVisuals + states: + Alive: + Base: quack + Dead: + Base: dead + - type: Slippery + paralyzeTime: 0.5 + launchForwardsMultiplier: 1.0 + - type: StepTrigger + intersectRatio: 0.2 + - type: NoSlip + - type: Butcherable + spawned: + - id: FoodFoodBanana + - type: Bloodstream + bloodReagent: Potassium + bloodMaxVolume: 100 + - type: MeleeWeapon + soundHit: + path: /Audio/Animals/duck_quack_happy.ogg + hidden: true + damage: + groups: + Slash: 2 + - type: NPCRetaliation + - type: CombatMode + - type: HTN + rootTask: + task: SimpleHostileCompound + - type: NPCImprintingOnSpawnBehaviour #your a momma now + whitelist: + components: + - HumanoidAppearance + +- type: entity + id: FoodEggQuananaFertilized + parent: FoodEgg + suffix: Fertilized, Quanana + components: + - type: Timer + - type: TimedSpawner + prototypes: + - MobBananaDuck + intervalSeconds: 20 + minimumEntitiesSpawned: 1 + maximumEntitiesSpawned: 1 + - type: TimedDespawn #delete the egg after the Quanana spawns + lifetime: 21 diff --git a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml index 48ba6daff4c..fdbbdce4471 100644 --- a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml @@ -65,3 +65,16 @@ FoodSpaceshroom: 1 FoodMushroom: 1 FoodFlyAmanita: 1 + +- type: microwaveMealRecipe + id: RecipeBananaDuck + name: Banana duck recipe + result: MobBananaDuck + time: 15 + reagents: + Milk: 10 + Cognizine: 5 + UnstableMutagen: 5 + solids: + TrashBakedBananaPeel: 1 + OrganAnimalHeart: 1 diff --git a/Resources/Textures/_NF/Mobs/Animals/Banana_duck.rsi/dead.png b/Resources/Textures/_NF/Mobs/Animals/Banana_duck.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..7bcdef68282af7ad08946f12e72cee4825e34770 GIT binary patch literal 4629 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 FV1m2CQkMV# literal 0 HcmV?d00001 From 5ab8cb2c10a85cd4f2d94732d3cb5675ffa58028 Mon Sep 17 00:00:00 2001 From: VividPups <68whiskty@gmail.com> Date: Mon, 16 Sep 2024 21:43:22 -0500 Subject: [PATCH 2/9] Update meta.json --- Resources/Textures/_NF/Mobs/Animals/Banana_duck.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/_NF/Mobs/Animals/Banana_duck.rsi/meta.json b/Resources/Textures/_NF/Mobs/Animals/Banana_duck.rsi/meta.json index 9c2feb4c956..ae07f9bcc93 100644 --- a/Resources/Textures/_NF/Mobs/Animals/Banana_duck.rsi/meta.json +++ b/Resources/Textures/_NF/Mobs/Animals/Banana_duck.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/commit/42e0275d860551197687c571c689c270ff423288", + "copyright": "Made by Bing guss", "size": { "x": 32, "y": 32 From 5195a0c3b58cd84d4e9168052a47336e4f30042d Mon Sep 17 00:00:00 2001 From: VividPups <68whiskty@gmail.com> Date: Mon, 16 Sep 2024 21:56:25 -0500 Subject: [PATCH 3/9] does tyhis ficadfaew --- Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml | 2 +- Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml index e50bd14b6f7..d48a6c063fa 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml @@ -118,7 +118,7 @@ hidden: true damage: groups: - Slash: 2 + slash: 2 - type: NPCRetaliation - type: CombatMode - type: HTN diff --git a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml index fdbbdce4471..2cbe8fe0e70 100644 --- a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml @@ -72,7 +72,7 @@ result: MobBananaDuck time: 15 reagents: - Milk: 10 + BananaHonk: 10 Cognizine: 5 UnstableMutagen: 5 solids: From c9c669e6892a4e0e0cffa45168967a9a9c5874de Mon Sep 17 00:00:00 2001 From: VividPups <68whiskty@gmail.com> Date: Mon, 16 Sep 2024 22:01:43 -0500 Subject: [PATCH 4/9] adaw awdad --- Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml index d48a6c063fa..e50bd14b6f7 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml @@ -118,7 +118,7 @@ hidden: true damage: groups: - slash: 2 + Slash: 2 - type: NPCRetaliation - type: CombatMode - type: HTN From 7f07d9e841e944e903bcb913aaa4a5741a5f4c1c Mon Sep 17 00:00:00 2001 From: VividPups <68whiskty@gmail.com> Date: Mon, 16 Sep 2024 22:09:20 -0500 Subject: [PATCH 5/9] Update animals.yml adad --- Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml index e50bd14b6f7..76c2ab4071c 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml @@ -117,7 +117,7 @@ path: /Audio/Animals/duck_quack_happy.ogg hidden: true damage: - groups: + type: Slash: 2 - type: NPCRetaliation - type: CombatMode From 18a8d0613c5325d35fb4f0c688462c04b47edff6 Mon Sep 17 00:00:00 2001 From: VividPups <68whiskty@gmail.com> Date: Mon, 16 Sep 2024 22:19:55 -0500 Subject: [PATCH 6/9] Update animals.yml --- Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml index 76c2ab4071c..b27dee4f9fc 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml @@ -108,7 +108,7 @@ - type: NoSlip - type: Butcherable spawned: - - id: FoodFoodBanana + - id: FoodBanana - type: Bloodstream bloodReagent: Potassium bloodMaxVolume: 100 From 014b281635a5c89bc390d2fc42767e0398113be1 Mon Sep 17 00:00:00 2001 From: VividPups <68whiskty@gmail.com> Date: Tue, 17 Sep 2024 19:09:49 -0500 Subject: [PATCH 7/9] Update animals.yml --- Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml index b27dee4f9fc..a64967ed2a3 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml @@ -114,11 +114,12 @@ bloodMaxVolume: 100 - type: MeleeWeapon soundHit: - path: /Audio/Animals/duck_quack_happy.ogg - hidden: true + path: /Audio/Effects/bite.ogg + angle: 0 + animation: WeaponArcBite damage: - type: - Slash: 2 + types: + Slash: 5 - type: NPCRetaliation - type: CombatMode - type: HTN From 999d4c89cde196d7b20f497c7f7d59c2867be237 Mon Sep 17 00:00:00 2001 From: VividPups <68whiskty@gmail.com> Date: Sun, 29 Sep 2024 11:15:35 -0500 Subject: [PATCH 8/9] less lines less lines i Think --- .../_NF/Entities/Mobs/NPCs/animals.yml | 79 ++++++------------- .../Objects/Consumable/Food/produce.yml | 25 ++++++ .../_NF/Recipes/Cooking/meal_recipes.yml | 55 +------------ .../_NF/Voice/speech_emote_sounds.yml | 7 ++ .../Prototypes/_NF/Voice/speech_sounds.yml | 11 ++- 5 files changed, 68 insertions(+), 109 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml index a64967ed2a3..bedf581f128 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml @@ -59,9 +59,9 @@ - type: entity name: Quanana - parent: MobDuckMallard + parent: [ FoodBanana, SimpleMobBase ] id: MobBananaDuck - description: It's a banana. It's a duck. It's a quanana. + description: It quacks. It's a banana. It's a quanana. components: - type: Sprite noRot: true @@ -69,78 +69,45 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: quack - sprite: _NF/Mobs/Animals/Banana_duck.rsi + sprite: _NF/Mobs/Animals/Banana_duck.rsi scale: 0.7,0.7 - type: GhostRole - prob: 1 name: ghost-role-information-BananaDuck-name allowMovement: true description: ghost-role-information-BananaDuck-description rules: ghost-role-information-nonantagonist-rules - type: GhostTakeoverAvailable - - type: ReproductivePartner - - type: Reproductive - breedChance: 0.10 - birthPopup: reproductive-laid-egg-popup - makeOffspringInfant: false - partnerWhitelist: - tags: - - Duck - offspring: - - id: FoodEggQuananaFertilized - maxAmount: 3 - type: EggLayer eggSpawn: - - id: FoodEggQuananaFertilized - - type: ReplacementAccent - accent: duck + - id: FoodBananaBaby + - type: Speech + speechSounds: Duck + speechVerb: SmallMob + - type: RotationVisuals + defaultRotation: 0 + horizontalRotation: 90 - type: DamageStateVisuals states: Alive: Base: quack Dead: - Base: dead + Base: quack - type: Slippery - paralyzeTime: 0.5 - launchForwardsMultiplier: 1.0 - type: StepTrigger intersectRatio: 0.2 - type: NoSlip - type: Butcherable spawned: - id: FoodBanana - - type: Bloodstream - bloodReagent: Potassium - bloodMaxVolume: 100 - - type: MeleeWeapon - soundHit: - path: /Audio/Effects/bite.ogg - angle: 0 - animation: WeaponArcBite - damage: - types: - Slash: 5 - - type: NPCRetaliation - - type: CombatMode - - type: HTN - rootTask: - task: SimpleHostileCompound - - type: NPCImprintingOnSpawnBehaviour #your a momma now - whitelist: - components: - - HumanoidAppearance - -- type: entity - id: FoodEggQuananaFertilized - parent: FoodEgg - suffix: Fertilized, Quanana - components: - - type: Timer - - type: TimedSpawner - prototypes: - - MobBananaDuck - intervalSeconds: 20 - minimumEntitiesSpawned: 1 - maximumEntitiesSpawned: 1 - - type: TimedDespawn #delete the egg after the Quanana spawns - lifetime: 21 + amount: 3 + - type: SolutionContainerManager # Shouldn't die in two bites + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: Nutriment + Quantity: 30 + - ReagentId: Vitamin + Quantity: 15 + - type: Puller + needsHands: false diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/produce.yml index 89fe69d639d..41d0202b77f 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/produce.yml @@ -261,3 +261,28 @@ tags: - Vegetable - Slice + +- type: entity + name: baby banana + parent: FoodBanana + id: FoodBananaBaby + description: Aww. Wait, how? + components: + - type: Food + - type: SolutionContainerManager + solutions: + food: + maxVol: 3 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Vitamin + Quantity: 1 + - type: Sprite + sprite: Objects/Specific/Hydroponics/banana.rsi + scale: 0.7,0.7 + - type: Extractable + juiceSolution: + reagents: + - ReagentId: JuiceBanana + Quantity: 5 diff --git a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml index 64296e8296d..06e704ba39b 100644 --- a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml @@ -151,7 +151,7 @@ - type: microwaveMealRecipe id: RecipeRaisins - name: raisins recipe + name: raisins result: ReagentContainerRaisin # A little bit cursed, spawning a bag time: 30 solids: @@ -166,55 +166,6 @@ FoodCucumber: 1 reagents: Saline: 10 - -- type: microwaveMealRecipe - id: RecipePoachedPears - name: poached pears recipe - result: FoodMealPoachedPears - time: 10 - solids: - FoodBowlBig: 1 - FoodPear: 3 - FoodOrange: 2 - reagents: - Wine: 10 - -- type: microwaveMealRecipe - id: RecipePearsBelleHelene - name: pears belle helene recipe - result: FoodMealPearsBelleHelene - time: 10 - solids: - FoodBowlBig: 1 - FoodPear: 3 - FoodSnackChocolateBar: 2 - FoodLemon: 1 - reagents: - Cream: 5 - -- type: microwaveMealRecipe - id: RecipePearMuffin - name: pear muffin recipe - result: FoodBakedMuffinPear - time: 10 - solids: - FoodPear: 1 - FoodSnackChocolateBar: 1 - reagents: - Flour: 5 - Oats: 5 - Sugar: 5 - -- type: microwaveMealRecipe - id: RecipePearCheeseTart - name: pear and cheese tart recipe - result: FoodTartPearCheese - time: 15 - solids: - FoodPlateTin: 1 - FoodDoughPie: 1 - FoodPear: 2 - FoodChevre: 1 # NOT ACTUAL FOOD @@ -238,5 +189,5 @@ Cognizine: 5 UnstableMutagen: 5 solids: - TrashBakedBananaPeel: 1 - OrganAnimalHeart: 1 + TrashBananaPeel: 1 + FoodEggDuckFertilized: 1 diff --git a/Resources/Prototypes/_NF/Voice/speech_emote_sounds.yml b/Resources/Prototypes/_NF/Voice/speech_emote_sounds.yml index 051ebeaf64e..b1eb73a201b 100644 --- a/Resources/Prototypes/_NF/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/_NF/Voice/speech_emote_sounds.yml @@ -126,3 +126,10 @@ sounds: Scream: collection: Fox + +- type: emoteSounds + id: Duck + sound: + path: /Audio/Animals/duck_quack_happy.ogg + params: + variation: 0.125 diff --git a/Resources/Prototypes/_NF/Voice/speech_sounds.yml b/Resources/Prototypes/_NF/Voice/speech_sounds.yml index 4df8e75e9bd..5691d03899c 100644 --- a/Resources/Prototypes/_NF/Voice/speech_sounds.yml +++ b/Resources/Prototypes/_NF/Voice/speech_sounds.yml @@ -14,4 +14,13 @@ askSound: path: /Audio/Animals/fox3.ogg exclaimSound: - path: /Audio/Animals/fox5.ogg \ No newline at end of file + path: /Audio/Animals/fox5.ogg + +- type: speechSounds + id: Duck + saySound: + path: /Audio/Animals/duck_quack_happy.ogg + askSound: + path: /Audio/Animals/duck_quack_happy.ogg + exclaimSound: + path: /Audio/Animals/duck_quack_happy.ogg From 246d7528a63c2887d5945f942f21ad62d5dd890c Mon Sep 17 00:00:00 2001 From: VividPups <68whiskty@gmail.com> Date: Sun, 29 Sep 2024 19:18:17 -0500 Subject: [PATCH 9/9] Update meal_recipes.yml readding pears --- .../_NF/Recipes/Cooking/meal_recipes.yml | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml index 06e704ba39b..fc8768469fc 100644 --- a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml @@ -167,6 +167,55 @@ reagents: Saline: 10 +- type: microwaveMealRecipe + id: RecipePoachedPears + name: poached pears recipe + result: FoodMealPoachedPears + time: 10 + solids: + FoodBowlBig: 1 + FoodPear: 3 + FoodOrange: 2 + reagents: + Wine: 10 + +- type: microwaveMealRecipe + id: RecipePearsBelleHelene + name: pears belle helene recipe + result: FoodMealPearsBelleHelene + time: 10 + solids: + FoodBowlBig: 1 + FoodPear: 3 + FoodSnackChocolateBar: 2 + FoodLemon: 1 + reagents: + Cream: 5 + +- type: microwaveMealRecipe + id: RecipePearMuffin + name: pear muffin recipe + result: FoodBakedMuffinPear + time: 10 + solids: + FoodPear: 1 + FoodSnackChocolateBar: 1 + reagents: + Flour: 5 + Oats: 5 + Sugar: 5 + +- type: microwaveMealRecipe + id: RecipePearCheeseTart + name: pear and cheese tart recipe + result: FoodTartPearCheese + time: 15 + solids: + FoodPlateTin: 1 + FoodDoughPie: 1 + FoodPear: 2 + FoodChevre: 1 + # NOT ACTUAL FOOD - type: microwaveMealRecipe