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