From 43b9233e09350f3f0483044a90212a7a1e38c953 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Mon, 5 Feb 2024 16:30:06 -0700 Subject: [PATCH] Special pens embed again (#24849) * embeddable pen * exploding pen * lol --- .../Entities/Objects/Misc/paper.yml | 21 ++++++++++++++++--- .../Entities/Objects/Weapons/Bombs/pen.yml | 2 +- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index 50f594abae..7769d6be7e 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -274,6 +274,21 @@ materialComposition: Steel: 25 +- type: entity + parent: Pen + id: PenEmbeddable + abstract: true + components: + - type: EmbeddableProjectile + offset: 0.3,0.0 + removalTime: 0.0 + - type: ThrowingAngle + angle: 315 + - type: DamageOtherOnHit + damage: + types: + Piercing: 3 + #TODO: I want the luxury pen to write a cool font like Merriweather in the future. - type: entity @@ -289,7 +304,7 @@ - type: entity name: Cybersun pen - parent: Pen + parent: PenEmbeddable id: CyberPen description: A high-tech pen straight from Cybersun's legal department, capable of refracting hard-light at impossible angles through its diamond tip in order to write. components: @@ -318,7 +333,7 @@ - type: entity name: captain's fountain pen - parent: Pen + parent: PenEmbeddable id: PenCap description: 'A luxurious fountain pen for the captain of the station.' components: @@ -341,7 +356,7 @@ - type: entity name: hop's fountain pen - parent: Pen + parent: PenEmbeddable id: PenHop description: 'A luxurious fountain pen for the hop of the station.' components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml index 029649ab37..c6c37d3642 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml @@ -1,7 +1,7 @@ - type: entity name: pen suffix: Exploding - parent: Pen + parent: PenEmbeddable description: A dark ink pen. id: PenExploding components: -- 2.51.2