All pens embed (#39104)

* Embed for all

* Unify all thrown pen damage

Removes PenEmbeddable Abstract Entity as it is redundant. Those that parented to it now just parent to Pen.

* Fancy Pens deserve that damage bonus

Keeps an abstract entity for fancier pens to parent off of. Someone might do different fonts in the future, and them doing more damage is funny.

diff --git a/Resources/Prototypes/Entities/Objects/Misc/pen.yml b/Resources/Prototypes/Entities/Objects/Misc/pen.yml
index a9329b67829235d1644f6af82a7ebbf21f1b934d..0eede77db740318863a8ee866e89f68e520082d3 100644 (file)
--- 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: Fixtures
     fixtures:
       fix1:
@@ -57,11 +51,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:
@@ -72,7 +76,7 @@
 
 - type: entity
   id: BaseAdvancedPen
-  parent: PenEmbeddable
+  parent: BasePenFancy
   abstract: true
   components:
   - type: Tag
@@ -120,7 +124,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:
@@ -129,7 +133,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:
@@ -138,7 +142,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 8de013afff280228a9a12aa496f4002db657b57d..86e79160bda9c5b108256d5399ade2189c5e1bf3 100644 (file)
--- 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: