diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
index b2b27048f0..44ddc1be9a 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
@@ -291,7 +291,7 @@
     - type: Tag
       tags:
       - PetWearable
-      - WhitelistChameleo
+      - WhitelistChameleon
 
 - type: entity
   parent: [ClothingEyesBase, BaseHighlyIllegalContraband,BaseNightVisionDevice]
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 43c049245c..ac0bc792ec 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -1217,60 +1217,6 @@
   - type: Icon
     state: pda-syndi-commander
 
-- type: entity
-  parent: [ SyndiPDA, BaseSyndicateContraband ]
-  id: SyndiOperativePDA
-  name: syndicate operative PDA
-  description: Death to NT!
-  components:
-  - type: Pda
-    id: SyndiOperativeIDCard
-  - type: Appearance
-    appearanceDataInit:
-     enum.PdaVisuals.PdaType:
-       !type:String
-       pda-syndi-operative
-  - type: Icon
-    state: pda-syndi-operative
-
-- type: entity
-  parent: [ SyndiOperativePDA, BaseSyndicateContraband ]
-  id: SyndiCorpsmanPDA
-  name: syndicate corpsman PDA
-  description: Commander... I need to cook!
-  components:
-  - type: Pda
-    id: SyndiCorpsmanIDCard
-  - type: Appearance
-    appearanceDataInit:
-     enum.PdaVisuals.PdaType:
-       !type:String
-       pda-syndi-corpsman
-  - type: Icon
-    state: pda-syndi-corpsman
-  - type: CartridgeLoader
-    uiKey: enum.PdaUiKey.Key
-    preinstalled:
-      - NotekeeperCartridge
-      - NanoTaskCartridge
-      - MedTekCartridge
-
-- type: entity
-  parent: [ SyndiOperativePDA, BaseSyndicateContraband ]
-  id: SyndiCommanderPDA
-  name: syndicate commander PDA
-  description: So what are we, some kind of Nukie squad?
-  components:
-  - type: Pda
-    id: SyndiCommanderIDCard
-  - type: Appearance
-    appearanceDataInit:
-     enum.PdaVisuals.PdaType:
-       !type:String
-       pda-syndi-commander
-  - type: Icon
-    state: pda-syndi-commander
-
 - type: entity
   parent: BaseSecurityPDA
   id: ERTLeaderPDA
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mech_construction.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mech_construction.yml
index 7d373d51c7..007afb67ba 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mech_construction.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mech_construction.yml
@@ -211,17 +211,23 @@
   - type: ContainerContainer
     containers:
       mech-assembly-container: !type:Container
-  - type: MechAssembly
-    finishedPrototype: DurandChassis
-    requiredParts:
-      DurandHead: false
-      DurandLArm: false
-      DurandRArm: false
-      DurandLLeg: false
-      DurandRLeg: false
+  - type: MechAssemblyVisuals
+    statePrefix: durand
   - type: Sprite
     state: durand_harness+o
     noRot: true
+  - type: PartAssembly
+    parts:
+      Durand:
+      - DurandHead
+      - DurandLArm
+      - DurandRArm
+      - DurandLLeg
+      - DurandRLeg
+    containerId: mech-assembly-container
+  - type: Construction
+    graph: Durand
+    node: start
 
 - type: entity
   parent: BaseDurandPartItem
@@ -356,17 +362,23 @@
   - type: ContainerContainer
     containers:
       mech-assembly-container: !type:Container
-  - type: MechAssembly
-    finishedPrototype: GygaxChassis
-    requiredParts:
-      GygaxHead: false
-      GygaxLArm: false
-      GygaxRArm: false
-      GygaxLLeg: false
-      GygaxRLeg: false
+  - type: MechAssemblyVisuals
+    statePrefix: gygax
   - type: Sprite
     state: gygax_harness+o
     noRot: true
+  - type: PartAssembly
+    parts:
+      Gygax:
+      - GygaxHead
+      - GygaxLArm
+      - GygaxRArm
+      - GygaxLLeg
+      - GygaxRLeg
+    containerId: mech-assembly-container
+  - type: Construction
+    graph: Gygax
+    node: start
 
 - type: entity
   parent: BaseGygaxPartItem
@@ -628,17 +640,23 @@
   - type: ContainerContainer
     containers:
       mech-assembly-container: !type:Container
-  - type: MechAssembly
-    finishedPrototype: RipleyMKIIChassis
-    requiredParts:
-      RipleyMKIIUpgradeKit: false
-      RipleyLArm: false
-      RipleyRArm: false
-      RipleyLLeg: false
-      RipleyRLeg: false
+  - type: MechAssemblyVisuals
+    statePrefix: ripleymkii
   - type: Sprite
     state: ripleymkii_harness+o
     noRot: true
+  - type: PartAssembly
+    parts:
+      RipleyMKII:
+      - RipleyMKIIUpgradeKit
+      - RipleyLArm
+      - RipleyRArm
+      - RipleyLLeg
+      - RipleyRLeg
+    containerId: mech-assembly-container
+  - type: Construction
+    graph: RipleyMKII
+    node: start
 
 - type: entity
   id: RipleyMKIIChassis
@@ -1005,17 +1023,23 @@
   - type: ContainerContainer
     containers:
       mech-assembly-container: !type:Container
-  - type: MechAssembly
-    finishedPrototype: PhazonChassis
-    requiredParts:
-      PhazonHead: false
-      PhazonLArm: false
-      PhazonRArm: false
-      PhazonLLeg: false
-      PhazonRLeg: false
+  - type: MechAssemblyVisuals
+    statePrefix: phazon
   - type: Sprite
     state: phazon_harness+o
     noRot: true
+  - type: PartAssembly
+    parts:
+      Phazon:
+      - PhazonHead
+      - PhazonLArm
+      - PhazonRArm
+      - PhazonLLeg
+      - PhazonRLeg
+    containerId: mech-assembly-container
+  - type: Construction
+    graph: Phazon
+    node: start
 
 - type: entity
   parent: BasePhazonPartItem
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 3a02aa968d..0ea42ad031 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -142,7 +142,7 @@
     - HydroponicsStatic
   - type: EmagLatheRecipes
     emagStaticPacks:
-    - SecurityAmmoStatic
+  #  - SecurityAmmoStatic # Sunrise - comment
     - SyndicateAmmoStatic
   - type: BlueprintReceiver
     whitelist:
@@ -478,7 +478,7 @@
       idleState: icon
       runningState: icon
       staticPacks:
-      - SecurityAmmoStatic
+    #  - SecurityAmmoStatic # Sunrise - comment
       - SecurityStaticSunrise # Sunrise-Add
     - type: EmagLatheRecipes
       emagStaticPacks:
diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Player/silicon.yml
index 6165b5d988..d15a42bb31 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Player/silicon.yml
@@ -190,7 +190,7 @@
         name: power-cell-slot-component-slot-name-default
         startingItem: PowerCellSyndicate
   - type: NoSlip
-  
+
 
 - type: entity
   id: PlayerBorgSyndicateReaperBattery
@@ -307,16 +307,18 @@
     sprite: _Sunrise/Objects/Devices/ai_card.rsi
     layers:
     - state: base
-    - state: full
+    - state: empty
       map: ["unshaded"]
       shader: unshaded
   - type: Appearance
   - type: GenericVisualizer
     visuals:
-      enum.StationAiVisualState.Key:
+      enum.StationAiVisualLayers.Icon:
         unshaded:
           Empty: { state: empty }
           Occupied: { state: full }
+          Rebooting: { state: dead }
+          Dead: { state: dead }
   - type: Intellicard
   - type: StaticPrice
     price: 500
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Clothing/Pouches/pouches.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Clothing/Pouches/pouches.yml
index 181bd61839..88354e90d9 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Clothing/Pouches/pouches.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Clothing/Pouches/pouches.yml
@@ -1,5 +1,6 @@
+# TODO: разобратся куда пропал родитель BaseClothingBeltSounds
 - type: entity
-  parent: [BaseClothingBeltSounds, ClothingBeltStorageBase]
+  parent: ClothingBeltStorageBase
   id: Pouch
   categories: [ HideSpawnMenu ]
   components:
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Drinks/drinks.yml
index 4a08020786..12563729d8 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -79,7 +79,7 @@
     state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkKvassGlass
   suffix: kvass
   components:
@@ -94,7 +94,7 @@
       sprite: _Sunrise/Objects/Consumable/Drinks/kvass.rsi
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   name: chamomile tincture
   id: DrinkChamomileTincture
   components:
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
index 29617d5fbf..831b078084 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
+  parent: [DrinkVisualsAllFilled, DrinkBottleGlassBaseFull]
   id: DrinkCampariBottleFull
   name: campari bottle
   description: Tincture based on aromatic herbs and citrus fruits. Non-GMO!
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml
index 045aedcf40..502eb6bff7 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml
@@ -151,6 +151,7 @@
   name: internal affairs agent ID card
   components:
   - type: Sprite
+    sprite: _Sunrise/Objects/Misc/id_cards.rsi
     layers:
     - state: silver
     - state: idiaa
@@ -163,6 +164,7 @@
   name: magistrate ID card
   components:
   - type: Sprite
+    sprite: _Sunrise/Objects/Misc/id_cards.rsi
     layers:
     - state: silver
     - state: idmagistrat
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/hypospray.yml
index 62d3c8caeb..6679893880 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/hypospray.yml
@@ -99,7 +99,6 @@
     filterReagentGroups:
      - Medicine
     onlyAffectsMobs: true
-    filterPoison: true
     doAfterTime: 0.75
     transferAmount: 5
   - type: UseDelay
diff --git a/Resources/Textures/_Sunrise/Objects/Devices/ai_card.rsi/dead.png b/Resources/Textures/_Sunrise/Objects/Devices/ai_card.rsi/dead.png
new file mode 100644
index 0000000000..2d21ec7f4e
Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Devices/ai_card.rsi/dead.png differ
diff --git a/Resources/Textures/_Sunrise/Objects/Devices/ai_card.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Devices/ai_card.rsi/meta.json
index aa3c8a2398..7e8bf51be0 100644
--- a/Resources/Textures/_Sunrise/Objects/Devices/ai_card.rsi/meta.json
+++ b/Resources/Textures/_Sunrise/Objects/Devices/ai_card.rsi/meta.json
@@ -53,6 +53,15 @@
           0.4
         ]
       ]
+    },
+    {
+      "name": "dead",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/idiaa.png b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/idiaa.png
new file mode 100644
index 0000000000..7e8e6e9c12
Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/idiaa.png differ
diff --git a/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/idmagistrat.png b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/idmagistrat.png
new file mode 100644
index 0000000000..8fe1ffbe10
Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/idmagistrat.png differ
diff --git a/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/meta.json
index 2caf78fdcf..1c4c91b660 100644
--- a/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/meta.json
+++ b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/meta.json
@@ -165,6 +165,12 @@
         },
         {
             "name": "abductor"
+        },
+        {
+            "name": "idmagistrat"
+        },
+        {
+            "name": "idiaa"
         }
     ]
 }