Guardian brushup and bullet passthrough (#7035)

Resources/Locale/en-US/guardian/guardian.ftl

@@ -12,7 +12,7 @@ guardian-available = Your guardian now has a soul.
 
 # Guardian action
 
-action-name-guardian = Toggle guardian manifestation
+action-name-guardian = Toggle Guardian
 action-description-guardian = Either manifests the guardian or recalls it back into your body
 
 ## Guardian entity specific

Resources/Prototypes/Entities/Mobs/Player/guardian.yml

@@ -1,12 +1,13 @@
 # Does not inherit from simplemob
 - type: entity
-  name: Holoparasite
+  abstract: true
-  id: MobHoloparasite
+  name: GuardianBase
-  description: A mesmerising whirl of hard-light patterns weaves a marvelous, yet oddly familiar visage. It stands proud, tuning into its owner's life to sustain itself.
+  id: MobGuardianBase
+  description: guardian
   components:
   - type: GhostTakeoverAvailable
     makeSentient: true
-    name: Holoparasite
+    name: Guardian
     description: Listen to your owner. Don't tank damage. Punch people hard.
   - type: Input
     context: "human"
@@ -42,9 +43,7 @@
         radius: 0.35
       mass: 10
       mask:
-      - Impassable
+      - VaultImpassable
-      - SmallImpassable
-      - MobImpassable
       layer:
       - Opaque
   - type: Damageable
@@ -73,5 +72,41 @@
     interactSuccessString: petting-success-holo
     interactFailureString: petting-failure-holo
     successChance: 0.7
+
+# From the uplink injector
+- type: entity
+  name: Holoparasite
+  id: MobHoloparasiteGuardian
+  parent: MobGuardianBase
+  description: A mesmerising whirl of hard-light patterns weaves a marvelous, yet oddly familiar visage. It stands proud, tuning into its owner's life to sustain itself.
+  components:
+  - type: GhostTakeoverAvailable
+    makeSentient: true
+    name: Holoparasite
+    description: Listen to your owner. Don't tank damage. Punch people hard.
   - type: NameIdentifier
-    group: Holoparasite
+    group: Holoparasite
+  - type: Sprite
+    layers:
+    - state: tech_base
+    - state: tech_flare
+      color: "#40a7d7"
+      shader: unshaded
+
+# From Wizard deck of cards
+- type: entity
+  name: Ifrit
+  parent: MobGuardianBase
+  id: MobIfritGuardian
+  description: A corrupted jinn, ripped from fitra to serve the wizard's petty needs. It stands wicked, tuning into it's owner's life to sustain itself.
+  components:
+  - type: GhostTakeoverAvailable
+    makeSentient: true
+    name: Ifrit
+    description: Listen to your owner. Don't tank damage. Punch people hard.
+  - type: Sprite
+    layers:
+    - state: magic_base
+    - state: magic_flare
+      color: "#d14730"
+      shader: unshaded

Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml

@@ -9,7 +9,20 @@
     state: combat_hypo
     netsync: false
   - type: GuardianCreator
-    guardianProto: MobHoloparasite
+    guardianProto: MobHoloparasiteGuardian
+
+- type: entity
+  name: magical lamp
+  id: MagicalLamp
+  parent: BaseItem
+  description: The wizard federation had to cut costs after the jinn merchandise scandal somehow.
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/Lights/lamp.rsi
+    layers:
+      - state: lamp
+  - type: GuardianCreator
+    guardianProto: MobIfritGuardian
 
 - type: entity
   name: holoparasite box