diff --git a/Resources/Prototypes/Entities/Objects/Misc/pen.yml b/Resources/Prototypes/Entities/Objects/Misc/pen.yml index 4e8c7b829e..dd0a756443 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/pen.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/pen.yml @@ -26,12 +26,6 @@ maxDistance: 2 - type: UseDelay delay: 1.5 - -- type: entity - parent: Pen - id: PenEmbeddable - abstract: true - components: - type: EmbeddableProjectile offset: 0.3,0.0 removalTime: 0.0 @@ -41,7 +35,7 @@ - type: DamageOtherOnHit damage: types: - Piercing: 3 + Piercing: 1 - type: Tending # Shitmed speed: 0.55 - type: SurgeryTool # Shitmed @@ -64,11 +58,21 @@ restitution: 0.3 friction: 0.2 +- type: entity + parent: Pen + id: BasePenFancy + abstract: true + components: + - type: DamageOtherOnHit + damage: + types: + Piercing: 3 #nothing shows luxury like inflicting injury + #TODO: I want the luxury pen to write a cool font like Merriweather in the future. - type: entity name: luxury pen - parent: Pen + parent: BasePenFancy id: LuxuryPen description: A fancy and expensive pen that you only deserve to own if you're qualified to handle vast amounts of paperwork. components: @@ -79,7 +83,7 @@ - type: entity id: BaseAdvancedPen - parent: PenEmbeddable + parent: BasePenFancy abstract: true components: - type: Tag @@ -127,7 +131,7 @@ - type: entity name: captain's fountain pen - parent: PenEmbeddable + parent: BasePenFancy id: PenCap description: A luxurious fountain pen for the captain of the station. components: @@ -136,7 +140,7 @@ - type: entity name: hop's fountain pen - parent: PenEmbeddable + parent: BasePenFancy id: PenHop description: A luxurious fountain pen for the hop of the station. components: @@ -145,7 +149,7 @@ - type: entity name: wizard's magical pen - parent: [ PenEmbeddable, BaseMagicalContraband ] + parent: [ BasePenFancy, BaseMagicalContraband ] id: PenWiz description: A luxurious fountain pen. Seems to have a magical crystal eraser. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml index fc158c39f6..b39b831207 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: PenEmbeddable + parent: Pen description: A dark ink pen. id: PenExploding components: