From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Mon, 19 Aug 2024 03:04:59 +0000 (-0400) Subject: add space carp and sharkminnow teeth (#31070) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=0a05ee9a27ecce39c0c4923ac9a9b41c1d18d50b;p=space-station-14.git add space carp and sharkminnow teeth (#31070) --- diff --git a/Resources/Locale/en-US/cargo/bounties.ftl b/Resources/Locale/en-US/cargo/bounties.ftl index c19de391f7..3a68bc07c5 100644 --- a/Resources/Locale/en-US/cargo/bounties.ftl +++ b/Resources/Locale/en-US/cargo/bounties.ftl @@ -66,6 +66,8 @@ bounty-item-wine = Wine bottle bounty-item-cotton-boll = Cotton boll bounty-item-microwave-machine-board = Microwave machine board bounty-item-flash = Flash +bounty-item-tooth-space-carp = Space Carp Tooth +bounty-item-tooth-sharkminnow = Sharkminnow Tooth bounty-description-artifact = NanoTrasen is in some hot water for stealing artifacts from non-spacefaring planets. Return one and we'll compensate you for it. bounty-description-baseball-bat = Baseball fever is going on at CentComm! Be a dear and ship them some baseball bats, so that management can live out their childhood dream. @@ -134,3 +136,5 @@ bounty-description-wine = The new librarian and the Quartermaster are falling he bounty-description-cotton-boll = A massive swarm of mothroaches ate all the paper and cloth on the station. Send us some cotton to help keep our winged crewmembers fed. bounty-description-microwave-machine-board = Mr. Giggles thought it'd be funny to stick forks in all the kitchen microwaves. Help us replace them before the chefs start making clown burgers. bounty-description-flashes = GREETINGS \[Station] WE REQUIRE 6 FLASHES DUE TO A NORMAL \[TrainingExercise] WITH SECURITY. EVERYTHING IS \[Normal]. +bounty-description-tooth-space-carp = Some lads from "down unda" need some teeth to make their traditional apparel. Send them a few from some space carp. +bounty-description-tooth-sharkminnow = The chef is claiming that the teeth of sharkminnows are some kind of high-quality knife. I don't know what they're on about, but they want a set. Send it to them. diff --git a/Resources/Prototypes/Catalog/Bounties/bounties.yml b/Resources/Prototypes/Catalog/Bounties/bounties.yml index 71d0d0b665..50d3eb2387 100644 --- a/Resources/Prototypes/Catalog/Bounties/bounties.yml +++ b/Resources/Prototypes/Catalog/Bounties/bounties.yml @@ -743,3 +743,25 @@ whitelist: components: - Flash + +- type: cargoBounty + id: BountyTeethSpaceCarp + reward: 800 + description: bounty-description-tooth-space-carp + entries: + - name: bounty-item-tooth-space-carp + amount: 8 + whitelist: + tags: + - ToothSpaceCarp + +- type: cargoBounty + id: BountyTeethSharkminnow + reward: 1500 + description: bounty-description-tooth-sharkminnow + entries: + - name: bounty-item-tooth-sharkminnow + amount: 5 + whitelist: + tags: + - ToothSharkminnow diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml index e345ec477b..4d9f408d9d 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml @@ -54,6 +54,9 @@ spawned: - id: FoodMeatFish amount: 2 + - id: MaterialToothSpaceCarp1 + amount: 1 + maxAmount: 4 - type: MeleeWeapon altDisarm: false angle: 0 @@ -234,6 +237,9 @@ spawned: - id: FoodMeatFish amount: 4 + - id: MaterialToothSharkminnow1 + amount: 1 + maxAmount: 3 - type: MeleeWeapon damage: types: diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml index 867b83f9ff..31777c2a84 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml @@ -599,6 +599,83 @@ - type: Stack count: 1 +- type: entity + parent: MaterialBase + id: MaterialToothSpaceCarp + name: space carp tooth + description: Pretty small but plenty nasty. You like them best when they're not sinking into you. + suffix: Full + components: + - type: Sprite + sprite: Objects/Materials/Mob/carptooth.rsi + layers: + - state: tooth + map: [ "base" ] + - type: Item + sprite: Objects/Materials/Mob/carptooth.rsi + size: Normal + - type: Appearance + - type: Stack + stackType: SpaceCarpTooth + count: 30 + baseLayer: base + layerStates: + - tooth + - tooth_2 + - tooth_3 + - type: StackPrice + price: 50 + - type: Tag + tags: + - ToothSpaceCarp + +- type: entity + parent: MaterialToothSpaceCarp + id: MaterialToothSpaceCarp1 + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + parent: [ MaterialBase, BaseKnife ] + id: MaterialToothSharkminnow + name: sharkminnow tooth + description: Looks sharp. Sharp enough to poke someone's eye out. Holy fuck it's big. + suffix: Full + components: + - type: Sprite + sprite: Objects/Materials/Mob/sharktooth.rsi + layers: + - state: tooth + map: [ "base" ] + - type: Item + sprite: Objects/Materials/Mob/sharktooth.rsi + size: Normal + - type: Appearance + - type: Stack + stackType: SharkMinnowTooth + count: 30 + baseLayer: base + layerStates: + - tooth + - tooth_2 + - tooth_3 + - type: StackPrice + price: 150 + - type: Tag + tags: + - Knife + - ToothSharkminnow + +- type: entity + parent: MaterialToothSharkminnow + id: MaterialToothSharkminnow1 + suffix: 1 + components: + - type: Stack + count: 1 + - type: entity parent: MaterialBase id: MaterialBones diff --git a/Resources/Prototypes/Stacks/Materials/materials.yml b/Resources/Prototypes/Stacks/Materials/materials.yml index 049f538bcc..69d4749548 100644 --- a/Resources/Prototypes/Stacks/Materials/materials.yml +++ b/Resources/Prototypes/Stacks/Materials/materials.yml @@ -75,6 +75,20 @@ spawn: MaterialWebSilk1 maxCount: 50 +- type: stack + id: SpaceCarpTooth + name: space carp tooth + icon: { sprite: /Textures/Objects/Materials/Mob/carptooth.rsi, state: tooth} + spawn: MaterialToothSpaceCarp1 + maxCount: 30 + +- type: stack + id: SharkMinnowTooth + name: sharkminnow tooth + icon: { sprite: /Textures/Objects/Materials/Mob/sharktooth.rsi, state: tooth} + spawn: MaterialToothSharkminnow1 + maxCount: 30 + - type: stack id: Bones name: bones diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 1e3ae71958..9b11570a25 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1263,6 +1263,12 @@ - type: Tag id: Toolbox +- type: Tag + id: ToothSharkminnow + +- type: Tag + id: ToothSpaceCarp + - type: Tag id: Torch diff --git a/Resources/Textures/Objects/Materials/Mob/carptooth.rsi/meta.json b/Resources/Textures/Objects/Materials/Mob/carptooth.rsi/meta.json new file mode 100644 index 0000000000..58ed20a9a6 --- /dev/null +++ b/Resources/Textures/Objects/Materials/Mob/carptooth.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Created by EmoGarbage404", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "tooth" + }, + { + "name": "tooth_2" + }, + { + "name": "tooth_3" + } + ] +} diff --git a/Resources/Textures/Objects/Materials/Mob/carptooth.rsi/tooth.png b/Resources/Textures/Objects/Materials/Mob/carptooth.rsi/tooth.png new file mode 100644 index 0000000000..e87d03cbae Binary files /dev/null and b/Resources/Textures/Objects/Materials/Mob/carptooth.rsi/tooth.png differ diff --git a/Resources/Textures/Objects/Materials/Mob/carptooth.rsi/tooth_2.png b/Resources/Textures/Objects/Materials/Mob/carptooth.rsi/tooth_2.png new file mode 100644 index 0000000000..3515c44a2c Binary files /dev/null and b/Resources/Textures/Objects/Materials/Mob/carptooth.rsi/tooth_2.png differ diff --git a/Resources/Textures/Objects/Materials/Mob/carptooth.rsi/tooth_3.png b/Resources/Textures/Objects/Materials/Mob/carptooth.rsi/tooth_3.png new file mode 100644 index 0000000000..836a44b8fb Binary files /dev/null and b/Resources/Textures/Objects/Materials/Mob/carptooth.rsi/tooth_3.png differ diff --git a/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/inhand-left.png b/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/inhand-left.png new file mode 100644 index 0000000000..4b76d5c85d Binary files /dev/null and b/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/inhand-right.png b/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/inhand-right.png new file mode 100644 index 0000000000..bf5c9f0451 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/meta.json b/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/meta.json new file mode 100644 index 0000000000..5aab9fb09d --- /dev/null +++ b/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Created by EmoGarbage404", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "tooth" + }, + { + "name": "tooth_2" + }, + { + "name": "tooth_3" + } + ] +} diff --git a/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/tooth.png b/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/tooth.png new file mode 100644 index 0000000000..695d772879 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/tooth.png differ diff --git a/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/tooth_2.png b/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/tooth_2.png new file mode 100644 index 0000000000..73c874df1f Binary files /dev/null and b/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/tooth_2.png differ diff --git a/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/tooth_3.png b/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/tooth_3.png new file mode 100644 index 0000000000..2ce73e5c13 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/tooth_3.png differ