From 0cecdd8b6d3d7c72b4d74f1bf5184ed5e926e1f3 Mon Sep 17 00:00:00 2001
From: TAZIKLIK <73418250+Evgencheg@users.noreply.github.com>
Date: Tue, 10 Sep 2024 19:59:24 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B2=D0=B0=D0=B6=D0=BD=D1=8B=D0=B5=20=D1=84?=
 =?UTF-8?q?=D0=B8=D0=BA=D1=81=D0=B8=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Roles/Jobs/Security/security_cadet.yml    |  2 +-
 .../Structures/Wallmounts/flagpole.yml        | 29 +++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
index 0aa684428c..6babc9125a 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
@@ -35,7 +35,7 @@
     id: SecurityCadetPDA
     ears: ClothingHeadsetSecurity
     belt: ClothingBeltSecurityFilled
-#    pocket1: WeaponPistolMk58Nonlethal # DeltaV - Security Cadet doesn't spawn with a gun
+    pocket1: WeaponPistolMk58Nonlethal # DeltaV - Security Cadet doesn't spawn with a gun
     pocket2: BookSecurity
     socks: LPPClothingUnderSocksNorm
     underwear: LPPBoxer
diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/flagpole.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/flagpole.yml
index 603f31a9f7..f8e5b8fceb 100644
--- a/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/flagpole.yml
+++ b/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/flagpole.yml
@@ -1,5 +1,30 @@
-- type: entity
+# < Made by DarkSide
+- type: entity
   parent: BaseStructure
+  id: LPPFlagWallBase
+  abstract: true
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Transform
+    anchored: true
+  - type: Clickable
+  - type: Physics
+    bodyType: Static
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.5
+        density: 100
+        mask:
+        - TableMask
+  - type: Pullable
+# < End
+
+- type: entity
+  parent: LPPFlagWallBase # < Edit DarkSide
   id: LPPFlagPoleBase
   name: flag pole
   description: Metal flagpole with a flag hanging from it.
@@ -41,7 +66,7 @@
     layers:
     - state: flagpole
     - state: flagpole-nt
-    
+
 - type: entity
   parent: LPPFlagPoleBase
   id: LPPFlagPoleCC