From: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Date: Tue, 29 Apr 2025 16:36:53 +0000 (+0200) Subject: Added Space Carp Tooth Arrows and Sharkminnow Spears, buffs sharkminnow teeth. (... X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=3f1ba3b6e79457d33434b6ed6b230e5ebd0c98ed;p=space-station-14.git Added Space Carp Tooth Arrows and Sharkminnow Spears, buffs sharkminnow teeth. (#31257) * carp arrow, sharkminnow tooth spear * review --------- Co-authored-by: EmoGarbage404 --- diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml index ea718c0744..f0b3d101ee 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml @@ -676,6 +676,10 @@ description: Looks sharp. Sharp enough to poke someone's eye out. Holy fuck it's big. suffix: Full components: + - type: MeleeWeapon + damage: + types: + Slash: 15 - type: Sprite sprite: Objects/Materials/Mob/sharktooth.rsi layers: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml index f1172c5de0..2c770adaa0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml @@ -159,3 +159,29 @@ - type: Construction graph: ImprovisedArrowUranium node: ImprovisedArrowUranium + +- type: entity + parent: BaseArrow + id: ArrowImprovisedCarp + name: carp tooth arrow + description: The salvager's preferred arrow. Kill your enemies with the teeth of their families. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/arrows.rsi + layers: + - state: tail + color: purple + - state: rod + color: darkgray + - state: tip + color: white + - state: solution1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: Projectile + damage: + types: + Piercing: 30 + - type: Construction + graph: ImprovisedArrowCarp + node: ImprovisedArrowCarp diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml index c5c300008c..2dfb1b363f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml @@ -214,3 +214,23 @@ max: 2 - !type:DoActsBehavior acts: [ "Destruction" ] + +- type: entity + name: sharkminnow tooth spear + parent: Spear + id: SpearSharkMinnow + description: A spear with a sharkminnow tooth as a tip. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/sharkminnow_spear.rsi + - type: MeleeWeapon + wideAnimationRotation: -135 + damage: + types: + Piercing: 18 #same as plasma spear + - type: DamageOtherOnHit + damage: + types: + Piercing: 25 #throw dmg enough to two-shot carp + - type: Construction + graph: SpearSharkMinnow \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml index 20e06e9f48..8f368f9e59 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml @@ -69,3 +69,24 @@ - node: ImprovisedArrowUranium entity: ArrowImprovisedUranium + +- type: constructionGraph + id: ImprovisedArrowCarp + start: start + graph: + - node: start + edges: + - to: ImprovisedArrowCarp + steps: + - material: MetalRod + amount: 1 + doAfter: 0.5 + - material: Cloth + amount: 1 + doAfter: 0.5 + - material: SpaceCarpTooth + amount: 1 + doAfter: 0.5 + + - node: ImprovisedArrowCarp + entity: ArrowImprovisedCarp diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml index d80df72dba..8b6f0708c7 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml @@ -126,3 +126,23 @@ doAfter: 1 - node: spear entity: SpearBone + +- type: constructionGraph + id: SpearSharkMinnow + start: start + graph: + - node: start + edges: + - to: spear + steps: + - material: MetalRod + amount: 2 + doAfter: 2 + - material: Cable + amount: 3 + doAfter: 1 + - material: SharkMinnowTooth + amount: 1 + doAfter: 1 + - node: spear + entity: SpearSharkMinnow diff --git a/Resources/Prototypes/Recipes/Construction/weapons.yml b/Resources/Prototypes/Recipes/Construction/weapons.yml index 5936a35069..4bc75805fe 100644 --- a/Resources/Prototypes/Recipes/Construction/weapons.yml +++ b/Resources/Prototypes/Recipes/Construction/weapons.yml @@ -108,6 +108,17 @@ icon: { sprite: Objects/Weapons/Melee/uranium_spear.rsi, state: spear } objectType: Item +- type: construction + name: sharkminnow tooth spear + id: SpearSharkMinnow + graph: SpearSharkMinnow + startNode: start + targetNode: spear + category: construction-category-weapons + description: A crude spear with a sharkminnow tooth for when you need to put holes in somebody. + icon: { sprite: Objects/Weapons/Melee/sharkminnow_spear.rsi, state: spear } + objectType: Item + - type: construction name: makeshift bola id: Bola @@ -152,6 +163,17 @@ icon: { sprite: Objects/Weapons/Guns/Bow/bow.rsi, state: wielded-arrow } objectType: Item +- type: construction + name: carp tooth arrow + id: ImprovisedArrowCarp + graph: ImprovisedArrowCarp + startNode: start + targetNode: ImprovisedArrowCarp + category: construction-category-weapons + description: An arrow tipped with a carp tooth, for use with a bow. + icon: { sprite: Objects/Weapons/Guns/Bow/bow.rsi, state: wielded-arrow } + objectType: Item + - type: construction name: plasma glass shard arrow id: ImprovisedArrowPlasma diff --git a/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..b307a98d3a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..b307a98d3a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/equipped-back-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/equipped-back-fill-1.png new file mode 100644 index 0000000000..db23cdc2a4 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/equipped-back-fill-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/equipped-suitstorage-fill-1.png new file mode 100644 index 0000000000..db23cdc2a4 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/equipped-suitstorage-fill-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..87a1358a8c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/inhand-left.png new file mode 100644 index 0000000000..31f0051911 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..4d0d61d0c1 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/inhand-right.png new file mode 100644 index 0000000000..54148bc2ba Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/meta.json new file mode 100644 index 0000000000..7f5c1681b5 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/meta.json @@ -0,0 +1,66 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, color modified by Boaz1111.", + "size": + { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "spear" + }, + { + "name": "spear1" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-left-fill-1", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-right-fill-1", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-left-fill-1", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-right-fill-1", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-back-fill-1", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "equipped-suitstorage-fill-1", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/spear.png b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/spear.png new file mode 100644 index 0000000000..fc1e7fc4ac Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/spear.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/spear1.png b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/spear1.png new file mode 100644 index 0000000000..fec362ac72 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/spear1.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/wielded-inhand-left-fill-1.png new file mode 100644 index 0000000000..e50787d3f9 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/wielded-inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..210b198cf7 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/wielded-inhand-right-fill-1.png new file mode 100644 index 0000000000..0a78a494a7 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/wielded-inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..65ab409050 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/sharkminnow_spear.rsi/wielded-inhand-right.png differ