diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index f9d367d6662..bc3a55658cd 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -95,50 +95,6 @@ sprite: Clothing/Belt/belt_overlay.rsi - type: Appearance -# HL start -- type: entity - parent: [NFClothingBeltStorageBase, ContentsExplosionResistanceBase, BaseC3SyndicateContraband] - id: ClothingBeltUtilitySyndicate - name: blood-red utility belt - description: It can hold various tools while looking fresh as fuck. - components: - - type: Sprite - sprite: _HL/Clothing/Belt/utility.rsi - - type: Clothing - sprite: _HL/Clothing/Belt/utility.rsi - - type: Storage - - type: ItemMapper - mapLayers: - drill: - whitelist: - tags: - - Syndie_Powerdrill - jaws: - whitelist: - tags: - - Syndie_JawsOfLife - multitool: - whitelist: - tags: - - Syndie_Multitool - sprite: _HL/Clothing/Belt/belt_overlay.rsi - - type: Appearance - -- type: entity - parent: ClothingBeltUtilitySyndicate - id: ClothingBeltUtilitySyndicateFilled - suffix: filled - components: - - type: StorageFill - contents: - - id: SyndicateJawsOfLife - - id: SyndicateWelderExperimental - - id: SyndicatePowerDrill - - id: SyndicateMultitool - - id: ClothingHandsGlovesCombat - - id: ClothingMaskGasSyndicate -# HL end - - type: entity parent: NFClothingBeltStorageBase # Frontier: ClothingBeltStorageBase C1 id: ClothingMaskGasSyndicate name: syndicate gas mask description: A close-fitting tactical mask that can be connected to an air supply. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index 983b6918c8a..f56d730369f 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -388,7 +388,7 @@ sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi - type: entity - parent: [BaseC3SyndicateContraband, ClothingOuterCoatHoSTrench, ContrabandClothing] # Frontier: BaseSyndicateContraband C2 id: ClothingOuterCoatSyndieCapArmored name: syndicate's armored coat description: The syndicate's armored coat is made of durable fabric, with gilded patterns. diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 36918e82f64..0d6879f8967 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -511,7 +511,7 @@ sprite: Clothing/Uniforms/Jumpskirt/hosformaldress.rsi - type: entity - parent: [UnsensoredClothingUniformSkirtBase, ContrabandClothing ] # Frontier: BaseSyndicateContraband C) id: ClothingUniformJumpsuitPyjamaSyndicateBlack name: black syndicate pyjamas description: For those long nights in perma. @@ -749,7 +749,7 @@ sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi - type: entity - parent: [UnsensoredClothingUniformBase, BaseC3SyndicateContraband, ContrabandClothing] # Frontier: BaseSyndicateContraband C) id: ClothingUniformJumpsuitPyjamaSyndicatePink name: pink syndicate pyjamas description: For those long nights in perma. @@ -760,7 +760,7 @@ sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi - type: entity - parent: [UnsensoredClothingUniformBase, BaseC3SyndicateContraband, ContrabandClothing] # Frontier: BaseSyndicateContraband C) id: ClothingUniformJumpsuitPyjamaSyndicateRed name: red syndicate pyjamas description: For those long nights in perma. @@ -815,7 +815,7 @@ sprite: Clothing/Uniforms/Jumpsuit/hosformal.rsi - type: entity - parent: [UnsensoredClothingUniformBase, BaseC3SyndicateContraband, ContrabandClothing] # Frontier: BaseSyndicateContraband C0 id: ClothingUniformJumpsuitOperative name: operative jumpsuit description: Uniform for elite syndicate operatives performing tactical operations in deep space. @@ -1119,7 +1119,7 @@ sprite: Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi - type: entity - parent: [ClothingUniformBase, BaseC3SyndicateContraband, ContrabandClothing] # Frontier: BaseSyndicateContraband C0 id: ClothingUniformJumpsuitSyndieFormal name: syndicate formal suit description: "The syndicate's uniform is made in an elegant style, it's even a pity to do dirty tricks in this." diff --git a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml index da5bc43a021..12d0520401f 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml @@ -307,7 +307,7 @@ - type: entity id: BedsheetSyndie - parent: [ BedsheetBase, BaseC3SyndicateContrabandNoValue ] # Frontier: BaseSyndicateContraband C0 name: syndicate bedsheet description: It has a syndicate emblem and it has an aura of evil. components: diff --git a/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml b/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml index e76c41446f1..02cc43b6f21 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml @@ -23,7 +23,7 @@ sprite: Objects/Misc/Handy_Flags/NT_handy_flag.rsi - type: entity - parent: [BaseItem, BaseC3SyndicateContraband, RecyclableItemClothSmall] # Frontier: BaseSyndicateContraband C0 id: SyndieHandyFlag name: syndicate handheld flag description: "For truly rebellious patriots. Death to NT!" diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml index 57fbbf949a2..ac85a993c98 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml @@ -52,7 +52,7 @@ - type: entity name: jaws of death - parent: [JawsOfLife, BaseC3SyndicateContraband] # Frontier: BaseSyndicateContraband C2 id: SyndicateJawsOfLife description: Useful for entering the station or its departments. components: diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index d5b0e45161b..98ab1509c69 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -314,113 +314,6 @@ soundHit: path: "/Audio/Items/drill_hit.ogg" -### HL start -- type: entity - name: gorlex maraudrill - parent: [PowerDrill, BaseC3SyndicateContraband] # Frontier: BaseSyndicateContraband C2 + id: SyndicateMultitool + description: An illegal tool to copy, store, and send electrical pulses and signals through wires, machines, and people. + components: + - type: EmitSoundOnLand + sound: + path: /Audio/Items/multitool_drop.ogg + - type: Sprite + sprite: _HL/Objects/Tools/multitaser.rsi + layers: + - state: icon + - state: green-unlit + shader: unshaded + - type: Item + size: Small + - type: Clothing + sprite: _HL/Objects/Tools/multitaser.rsi + quickEquip: false + slots: + - Belt + - type: Tool + qualities: + - Pulsing + - type: NetworkConfigurator + - type: ActivatableUI + key: enum.NetworkConfiguratorUiKey.List + inHandsOnly: true + - type: UserInterface + interfaces: + enum.NetworkConfiguratorUiKey.List: + type: NetworkConfiguratorBoundUserInterface + enum.NetworkConfiguratorUiKey.Configure: + type: NetworkConfiguratorBoundUserInterface + enum.NetworkConfiguratorUiKey.Link: + type: NetworkConfiguratorBoundUserInterface + - type: Tag + tags: + - Syndie_Multitool + - DoorElectronicsConfigurator + - type: PhysicalComposition + materialComposition: + Steel: 100 + Plastic: 100 + - type: StaticPrice + price: 28 # Frontier 56<28 + - type: GuideHelp + guides: + - Networking + - WirePanels + - Airlocks + - InspectingPower + - type: MeleeWeapon + wideAnimationRotation: -90 + attackRate: 2 + damage: + types: + Shock: 8 + soundHit: + path: /Audio/Items/Defib/defib_zap.ogg diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/headwear_syndicate.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/headwear_syndicate.yml index 51215b5a1e7..8c6e9d5bbdb 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/headwear_syndicate.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/headwear_syndicate.yml @@ -1,7 +1,7 @@ # Syndicate Bomb Suit Helmet - type: entity parent: - - BaseC3SyndicateContrabandUnredeemable + # - BaseC3SyndicateContrabandUnredeemable # HL - ClothingHeadHelmetBombSuit - ContrabandClothing id: ClothingHeadHelmetBombSuitSyndie diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/suits.yml index 2748e3c00c1..fc212a8eddc 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/suits.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/suits.yml @@ -1,7 +1,7 @@ # Syndicate bomb suit - type: entity parent: - - BaseC3SyndicateContraband + # - BaseC3SyndicateContraband # HL - ClothingOuterSuitBomb - ContrabandClothing id: ClothingOuterSuitBombSyndie