Contra Review Passs - Round 2 (#30942)

* Contra pass round two

* command too

* Stamps

* oopsied a bracket

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index b72fce11075c4fe4df4997369254535df4e9a275..265ab7d86d1b085642d9e6ede9e27d8e746741fc 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -156,7 +156,7 @@
         prob: 0.5
 
 - type: entity
-  parent: GunSafe
+  parent: [GunSafe, BaseRestrictedContraband]
   id: GunSafeDisabler
   name: disabler safe
   components:
@@ -166,7 +166,7 @@
       amount: 5
 
 - type: entity
-  parent: GunSafe
+  parent: [GunSafe, BaseRestrictedContraband]
   id: GunSafePistolMk58
   name: mk58 safe
   components:
@@ -178,7 +178,7 @@
       amount: 8
 
 - type: entity
-  parent: GunSafe
+  parent: [GunSafe, BaseRestrictedContraband]
   id: GunSafeRifleLecter
   name: lecter safe
   components:
@@ -190,7 +190,7 @@
       amount: 4
 
 - type: entity
-  parent: GunSafe
+  parent: [GunSafe, BaseRestrictedContraband]
   id: GunSafeSubMachineGunDrozd
   name: drozd safe
   components:
@@ -202,7 +202,7 @@
       amount: 4
 
 - type: entity
-  parent: GunSafe
+  parent: [GunSafe, BaseRestrictedContraband]
   id: GunSafeShotgunEnforcer
   name: enforcer safe
   components:
@@ -214,7 +214,7 @@
       amount: 4
 
 - type: entity
-  parent: GunSafe
+  parent: [GunSafe, BaseRestrictedContraband]
   id: GunSafeShotgunKammerer
   name: kammerer safe
   components:
@@ -228,7 +228,7 @@
 - type: entity
   id: GunSafeSubMachineGunWt550
   suffix: Wt550
-  parent: GunSafe
+  parent: [GunSafe, BaseRestrictedContraband]
   name: wt550 safe
   components:
   - type: StorageFill

diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
index 20c1c74532523dcc11b0ebc524172a2ac42f67ce..5520b6751a167b8bad7b8680548decddc88e4c1f 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
@@ -158,7 +158,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: [ClothingEyesBase, ShowSecurityIcons]
+  parent: [ClothingEyesBase, ShowSecurityIcons, BaseSecurityCommandContraband]
   id: ClothingEyesGlassesSecurity
   name: security glasses
   description: Upgraded sunglasses that provide flash immunity and a security HUD.

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
index 593ad78f72f84fe7c82d2a6bb388b3dab3ad2ef8..532cf93d1505450089081f26abcdf8fe05b66d56 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -314,7 +314,7 @@
     sprite: Clothing/OuterClothing/Coats/pirate.rsi
 
 - type: entity
-  parent: [ClothingOuterArmorWarden, ClothingOuterStorageBase]
+  parent: [ClothingOuterArmorWarden, ClothingOuterStorageBase, BaseRestrictedContraband]
   id: ClothingOuterCoatWarden
   name: warden's armored jacket
   description: A sturdy, utilitarian jacket designed to protect a warden from any brig-bound threats.

diff --git a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
index 623efa727696e426f83a13d4873d668bcb19740d..9c73760b6f106d2661ad73d53c6665f9f378f4fb 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
@@ -15,7 +15,7 @@
     stealGroup: DoorRemote
 
 - type: entity
-  parent: DoorRemoteDefault
+  parent: [DoorRemoteDefault, BaseCommandContraband]
   id: DoorRemoteCommand
   name: command door remote
   components:
@@ -31,7 +31,7 @@
     - Command
 
 - type: entity
-  parent: DoorRemoteDefault
+  parent: [DoorRemoteDefault, BaseCommandContraband]
   id: DoorRemoteSecurity
   name: security door remote
   components:
@@ -47,7 +47,7 @@
     - Security
 
 - type: entity
-  parent: DoorRemoteDefault
+  parent: [DoorRemoteDefault, BaseSecurityCommandContraband]
   id: DoorRemoteArmory
   name: armory door remote
   components:
@@ -63,7 +63,7 @@
     - Armory
 
 - type: entity
-  parent: DoorRemoteDefault
+  parent: [DoorRemoteDefault, BaseCommandContraband]
   id: DoorRemoteService
   name: service door remote
   components:
@@ -79,7 +79,7 @@
     - Service
 
 - type: entity
-  parent: DoorRemoteDefault
+  parent: [DoorRemoteDefault, BaseCommandContraband]
   id: DoorRemoteResearch
   name: research door remote
   components:
@@ -95,7 +95,7 @@
     - Research
 
 - type: entity
-  parent: DoorRemoteDefault
+  parent: [DoorRemoteDefault, BaseCommandContraband]
   id: DoorRemoteCargo
   name: cargo door remote
   components:
@@ -111,7 +111,7 @@
     - Cargo
 
 - type: entity
-  parent: DoorRemoteDefault
+  parent: [DoorRemoteDefault, BaseCommandContraband]
   id: DoorRemoteMedical
   name: medical door remote
   components:
@@ -127,7 +127,7 @@
     - Medical
 
 - type: entity
-  parent: DoorRemoteDefault
+  parent: [DoorRemoteDefault, BaseCommandContraband]
   id: DoorRemoteEngineering
   name: engineering door remote
   components:
@@ -143,7 +143,7 @@
     - Engineering
 
 - type: entity
-  parent: DoorRemoteDefault
+  parent: [DoorRemoteDefault, BaseCommandContraband]
   id: DoorRemoteAll
   name: super door remote
   suffix: Admeme

diff --git a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml
index 4d36af445924e9ca5c9627811e6de15d16d7b265..5562140891c8b2289546f6dffca59e2fdaf13158 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml
@@ -42,7 +42,7 @@
 - type: entity
   name: pinpointer
   id: PinpointerNuclear
-  parent: PinpointerBase
+  parent: [ PinpointerBase, BaseCommandContraband ]
   components:
   - type: Pinpointer
     component: NukeDisk
@@ -52,7 +52,7 @@
   name: syndicate pinpointer
   description: Produced specifically for nuclear operative missions, get that disk!
   id: PinpointerSyndicateNuclear
-  parent: PinpointerBase
+  parent: [ PinpointerBase, BaseSyndicateContraband ]
   components:
   - type: Sprite
     layers:

diff --git a/Resources/Prototypes/Entities/Objects/Misc/medalcase.yml b/Resources/Prototypes/Entities/Objects/Misc/medalcase.yml
index 35000b3fba10ac2b42c39e8a450a5c410f2ab3b5..d0e732e229c5987b48aa55414b079eed4f00c095 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/medalcase.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/medalcase.yml
@@ -2,7 +2,7 @@
   id: MedalCase
   name: medal case
   description: Case with medals.
-  parent: [ BaseStorageItem, BaseBagOpenClose ]
+  parent: [ BaseStorageItem, BaseBagOpenClose, BaseCommandContraband ]
   components:
   - type: Sprite
     sprite: Objects/Storage/medalcase.rsi

diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
index 2edd17a5ce2ac52f4c2349fb40fd198fced04c23..fc362bb9c7293b526295ef71784965749f0dabc5 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
@@ -39,7 +39,7 @@
 
 - type: entity
   name: captain's rubber stamp
-  parent: RubberStampBase
+  parent: [RubberStampBase, BaseCommandContraband]
   id: RubberStampCaptain
   suffix: DO NOT MAP
   components:
@@ -107,7 +107,7 @@
 
 - type: entity
   name: chief engineer's rubber stamp
-  parent: RubberStampBase
+  parent: [RubberStampBase, BaseCommandContraband]
   id: RubberStampCE
   suffix: DO NOT MAP
   components:
@@ -120,7 +120,7 @@
 
 - type: entity
   name: chief medical officer's rubber stamp
-  parent: RubberStampBase
+  parent: [RubberStampBase, BaseCommandContraband]
   id: RubberStampCMO
   suffix: DO NOT MAP
   components:
@@ -133,7 +133,7 @@
 
 - type: entity
   name: head of personnel's rubber stamp
-  parent: RubberStampBase
+  parent: [RubberStampBase, BaseCommandContraband]
   id: RubberStampHop
   suffix: DO NOT MAP
   components:
@@ -146,7 +146,7 @@
 
 - type: entity
   name: head of security's rubber stamp
-  parent: RubberStampBase
+  parent: [RubberStampBase, BaseCommandContraband]
   id: RubberStampHos
   suffix: DO NOT MAP
   components:
@@ -173,7 +173,7 @@
 
 - type: entity
   name: quartermaster's rubber stamp
-  parent: RubberStampBase
+  parent: [RubberStampBase, BaseCommandContraband]
   id: RubberStampQm
   suffix: DO NOT MAP
   components:
@@ -186,7 +186,7 @@
 
 - type: entity
   name: research director's rubber stamp
-  parent: RubberStampBase
+  parent: [RubberStampBase, BaseCommandContraband]
   id: RubberStampRd
   suffix: DO NOT MAP
   components:
@@ -224,7 +224,7 @@
 
 - type: entity
   name: warden's rubber stamp
-  parent: RubberStampBase
+  parent: [RubberStampBase, BaseRestrictedContraband]
   id: RubberStampWarden
   suffix: DO NOT MAP
   components:
@@ -261,7 +261,7 @@
 
 - type: entity
   name: detective's rubber stamp
-  parent: RubberStampBase
+  parent: [RubberStampBase, BaseRestrictedContraband]
   id: RubberStampDetective
   suffix: DO NOT MAP
   components:

diff --git a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
index d2b17dd019ea92d07864600ba18ab453b97ba888..efada99e7cbe6f28b8d7f3d5970c8f5756aedbbc 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
@@ -220,7 +220,7 @@
 #Empty security
 - type: entity
   id: JetpackSecurity
-  parent: BaseJetpack
+  parent: [BaseJetpack, BaseRestrictedContraband]
   name: security jetpack
   suffix: Empty
   components:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
index 1aac442414982a936d77cb231c3e225fd8fb7982..a9474cedeaf09baa4f7fc3f9dcb0f90e445e36f5 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
@@ -1,7 +1,7 @@
 - type: entity
   name: hot potato
   description: Once activated, you can't drop this time bomb - hit someone else with it to save yourself! Don't burn your hands!
-  parent: BaseItem
+  parent: [BaseItem, BaseSyndicateContraband]
   id: HotPotato
   components:
     - type: Sprite

diff --git a/Resources/Prototypes/Entities/Structures/Machines/nuke.yml b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml
index 5384d7e9d09511449fccfba0bb46bc29dc436f5d..ec9e5bdfa588c98e8bb7cdbdecb6297a3c8e0cdb 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/nuke.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: [BaseStructure, StructureWheeled]
+  parent: [BaseStructure, StructureWheeled, BaseMajorContraband]
   id: NuclearBomb
   name: nuclear fission explosive
   description: You probably shouldn't stick around to see if this is armed.
@@ -163,7 +163,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.45
-        density: 255 
+        density: 255
         mask:
         - MachineMask
         layer: