Contra Review Passs - Round 2 (#30942)

* Contra pass round two * command too * Stamps * oopsied a bracket
2024-08-15 10:35:06 -07:00
parent 84f9dd0f0b
commit f523df821a
10 changed files with 34 additions and 34 deletions
--- 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
--- 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.
--- 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.
--- 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
--- 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:
--- 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
--- 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:
--- 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:
--- 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
--- 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: