Magical contraband type (#35254)

* init

* really ponderous

diff --git a/Resources/Locale/en-US/contraband/contraband-severity.ftl b/Resources/Locale/en-US/contraband/contraband-severity.ftl
index d79ecfa4b2d016c9ecbc96ae103d9fcaa5a4938c..10baf2cb25d26f5f5a8d3b67a56b9a355b5d8ad4 100644 (file)
--- a/Resources/Locale/en-US/contraband/contraband-severity.ftl
+++ b/Resources/Locale/en-US/contraband/contraband-severity.ftl
@@ -4,6 +4,7 @@ contraband-examine-text-Restricted-department = [color=yellow]This item is restr
 contraband-examine-text-Major = [color=red]This item is considered major contraband.[/color]
 contraband-examine-text-GrandTheft = [color=red]This item is a highly valuable target for Syndicate agents![/color]
 contraband-examine-text-Syndicate = [color=crimson]This item is highly illegal Syndicate contraband![/color]
+contraband-examine-text-Magical = [color=#b337b3]This item is highly illegal Magical contraband![/color]
 
 contraband-examine-text-avoid-carrying-around = [color=red][italic]You probably want to avoid visibly carrying this around without a good reason.[/italic][/color]
 contraband-examine-text-in-the-clear = [color=green][italic]You should be in the clear to visibly carry this around.[/italic][/color]

diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 19ff2f278f41434e9d24d61d35f7ad21e6dc1534..a70fe17ed6bcea4faa70a19d293d21b14e4596d2 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -700,7 +700,7 @@
     sprite: Clothing/Belt/suspenders_black.rsi
 
 - type: entity
-  parent: ClothingBeltStorageBase
+  parent: [ ClothingBeltStorageBase, BaseMagicalContraband ]
   id: ClothingBeltWand
   name: wand belt
   description: A belt designed to hold various rods of power. A veritable fanny pack of exotic magic.

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 6c0d405b4df8ebd56598699e8a71b5b3033cc103..1e818226d5890b0370ca77571c7b8345bd66d7de 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -580,7 +580,7 @@
 
 - type: entity
   abstract: true
-  parent: ClothingHeadBase
+  parent: [ ClothingHeadBase, BaseMagicalContraband ]
   id: ClothingHeadHatWizardBase
   components:
   - type: WizardClothes

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index 4745bc8dbd756fe66c82cd537cb3611d048377d8..08ac6f32c0ba5cb6a5d4f96bb4ff9a2630151c67 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -677,7 +677,7 @@
 
 #Wizard Hardsuit
 - type: entity
-  parent: ClothingOuterHardsuitBase
+  parent: [ ClothingOuterHardsuitBase, BaseMagicalContraband ]
   id: ClothingOuterHardsuitWizard
   name: wizard hardsuit
   description: A bizarre gem-encrusted suit that radiates magical energies.

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
index c8c83f9db80afafcbff5693e2cebc13f84f12cf3..41128530217878ff03f722284d65a02353f8a18a 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
@@ -168,7 +168,7 @@
 
 - type: entity
   abstract: true
-  parent: ClothingOuterBase
+  parent: [ ClothingOuterBase, BaseMagicalContraband ]
   id: ClothingOuterWizardBase
   components:
   - type: WizardClothes

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index d7cde640a4ec644fe705891b59276707d38e9210..eeb0fa6bffa380f06233335b09d7521484ff4213 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -1345,7 +1345,7 @@
         volume: -10
 
 - type: entity
-  parent: BaseItem
+  parent: [ BaseItem, BaseMagicalContraband ]
   id: PonderingOrb
   name: pondering orb
   description: Ponderous, man... Really ponderous.

diff --git a/Resources/Prototypes/Entities/Objects/Magic/books.yml b/Resources/Prototypes/Entities/Objects/Magic/books.yml
index d000f784290bb170c27f2f20ad59c2761e6a0b96..db604f92d39198e551b98cb74172a484d1e11066 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Magic/books.yml
+++ b/Resources/Prototypes/Entities/Objects/Magic/books.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: BaseSpellbook
   name: spellbook
-  parent: BaseItem
+  parent: [ BaseItem, BaseMagicalContraband ]
   abstract: true
   components:
     - type: Sprite
@@ -25,7 +25,7 @@
   id: WizardsGrimoire
   name: wizards grimoire
   suffix: Wizard
-  parent: [ BaseItem, StorePresetSpellbook ]
+  parent: [ BaseItem, StorePresetSpellbook, BaseMagicalContraband ]
   components:
     - type: Sprite
       sprite: Objects/Misc/books.rsi

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml
index 9cab4cac25a4a318f9c2702d824a9bc612963ad2..0ce441d29126499641100cca8580744408f8ff92 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: WeaponStaffBase
   abstract: true
-  parent: BaseItem
+  parent: [ BaseItem, BaseMagicalContraband ]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Basic/staves.rsi

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml
index c4a937ee2cd1b497b7bfac8bd3e680f3bb2bccb9..555a760c909a7a6b40f081932946ede4ab95c5ca 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: WeaponWandBase
   abstract: true
-  parent: BaseItem
+  parent: [ BaseItem, BaseMagicalContraband ]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Basic/wands.rsi

diff --git a/Resources/Prototypes/Entities/Objects/base_contraband.yml b/Resources/Prototypes/Entities/Objects/base_contraband.yml
index 721780880775e50465c30bbb9026f8b7b6afd8b4..032218f8c0b7aa8730a9d93b6f31feac98637482 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/base_contraband.yml
+++ b/Resources/Prototypes/Entities/Objects/base_contraband.yml
@@ -1,4 +1,12 @@
-# non-stealth syndicate stuff
+# any type of magical items used by wizards and similiar
+- type: entity
+  id: BaseMagicalContraband
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Magical
+
+# non-stealth syndicate stuff
 - type: entity
   id: BaseSyndicateContraband
   abstract: true

diff --git a/Resources/Prototypes/Magic/staves.yml b/Resources/Prototypes/Magic/staves.yml
index ea42c47d18495c10196c97f5b1e46e4b6bc664ca..0582899495f16361ad74c874f91a6f7aae0714c8 100644 (file)
--- a/Resources/Prototypes/Magic/staves.yml
+++ b/Resources/Prototypes/Magic/staves.yml
@@ -34,7 +34,7 @@
 
 - type: entity
   id: AnimationStaff
-  parent: BaseItem
+  parent: [ BaseItem, BaseMagicalContraband ]
   name: staff of animation
   description: Brings inanimate objects to life!
   components:

diff --git a/Resources/Prototypes/contraband_severities.yml b/Resources/Prototypes/contraband_severities.yml
index c103af5e0a6a0d97bc079e0d69c71ffbb5251e9b..38349d9497210cf60e0000423464b15565a793cf 100644 (file)
--- a/Resources/Prototypes/contraband_severities.yml
+++ b/Resources/Prototypes/contraband_severities.yml
@@ -25,3 +25,8 @@
 - type: contrabandSeverity
   id: Syndicate
   examineText: contraband-examine-text-Syndicate
+
+# This is magical contraband and not permitted to be used IC.
+- type: contrabandSeverity
+  id: Magical
+  examineText: contraband-examine-text-Magical