From: Coolsurf6 Date: Thu, 24 Apr 2025 02:57:53 +0000 (+1000) Subject: Updated Syndicate and Ammo Contraband (#35102) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=b7a0bce4a46dff05d531aff6af5868c5a1222ae7;p=space-station-14.git Updated Syndicate and Ammo Contraband (#35102) Co-authored-by: RedBookcase --- diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 142cac767e..a0b49d48d5 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -783,7 +783,7 @@ ############################################################## - type: entity - parent: [ClothingOuterWinterWarden, BaseSyndicateContraband] + parent: [ BaseSyndicateContraband, ClothingOuterWinterWarden ] id: ClothingOuterWinterSyndieCapArmored name: syndicate's armored winter coat description: "The syndicate's armored winter coat is made of durable fabric, with gilded patterns, and coarse wool." diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 8fd5b5a831..ee4dacaeaa 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -625,7 +625,7 @@ sprite: Clothing/Uniforms/Jumpskirt/lawyergood.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [ ClothingUniformSkirtBase, BaseSyndicateContraband ] id: ClothingUniformJumpskirtSyndieFormalDress name: syndicate formal dress 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/Clothing/Uniforms/ship_vs_ship.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml index f10317e221..b19f70881d 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml @@ -15,7 +15,7 @@ sprite: Clothing/Uniforms/Jumpsuit/recruit_nt.rsi - type: entity - parent: ClothingUniformBase + parent: [ ClothingUniformBase, BaseSyndicateContraband ] id: ClothingUniformJumpsuitRecruitSyndie name: syndicate recruit jumpsuit description: A dubious, dark-grey jumpsuit. As if passengers weren't dubious enough already. @@ -38,7 +38,7 @@ sprite: Clothing/Uniforms/Jumpsuit/repairman_nt.rsi - type: entity - parent: ClothingUniformBase + parent: [ ClothingUniformBase, BaseSyndicateContraband ] id: ClothingUniformJumpsuitRepairmanSyndie name: syndicate repairman jumpsuit description: Functional, fashionable, and badass. Nanotrasen's engineers wish they could look as good as this. @@ -61,7 +61,7 @@ sprite: Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi - type: entity - parent: ClothingUniformBase + parent: [ ClothingUniformBase, BaseSyndicateContraband ] id: ClothingUniformJumpsuitParamedicSyndie name: syndicate paramedic jumpsuit description: For some reason, wearing this makes you feel like you're awfully close to violating the Geneva Convention. @@ -85,7 +85,7 @@ sprite: Clothing/Uniforms/Jumpsuit/ce_nt.rsi - type: entity - parent: ClothingUniformBase + parent: [ ClothingUniformBase, BaseSyndicateContraband ] id: ClothingUniformJumpsuitChiefEngineerSyndie name: syndicate chief engineer jumpsuit description: An evil-looking jumpsuit with a reflective vest & red undershirt. #TODO: Write a better description for this once Ship vs. Ship is real and actual player habits begin forming diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml index 69734a5c57..89cf314e95 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml @@ -449,7 +449,7 @@ prototype: ComputerShuttle - type: entity - parent: BaseComputerCircuitboard + parent: [ BaseComputerCircuitboard, BaseSyndicateContraband ] id: SyndicateShuttleConsoleCircuitboard name: syndicate shuttle console board description: A computer printed circuit board for a syndicate shuttle console. @@ -482,7 +482,7 @@ prototype: ComputerIFF - type: entity - parent: BaseComputerCircuitboard + parent: [ BaseComputerCircuitboard, BaseSyndicateContraband ] id: ComputerIFFSyndicateCircuitboard name: syndicate IFF console board description: Allows you to control the IFF and stealth characteristics of this vessel. diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index e47d6d2ec7..fbbdfe2b77 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -1062,7 +1062,7 @@ - DoorBumpOpener - type: entity - parent: BasePDA + parent: [ BasePDA, BaseSyndicateContraband ] id: SyndiPDA name: syndicate PDA description: Ok, time to be a productive member of- oh cool I'm a bad guy time to kill people! @@ -1419,7 +1419,7 @@ state: pda-seniorofficer - type: entity - parent: SyndiPDA + parent: [ BaseMajorContraband, SyndiPDA ] id: PiratePDA name: pirate PDA description: Yargh! @@ -1435,7 +1435,7 @@ state: pda-pirate - type: entity - parent: BaseMedicalPDA + parent: [ BaseMedicalPDA, BaseSyndicateContraband ] id: SyndiAgentPDA name: syndicate corpsman PDA description: For those days when healing normal syndicates aren't enough, try healing nuclear operatives instead! diff --git a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml index 4cb6a8bf1e..ddc17240f1 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml @@ -306,7 +306,7 @@ - type: entity id: BedsheetSyndie - parent: BedsheetBase + parent: [ BedsheetBase, BaseSyndicateContraband ] 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/business_card.yml b/Resources/Prototypes/Entities/Objects/Misc/business_card.yml index a04351693a..841d5f2099 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/business_card.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/business_card.yml @@ -1,7 +1,7 @@ - type: entity id: SyndicateBusinessCard name: syndicate business card - parent: Paper + parent: [ Paper, BaseSyndicateContraband ] description: A black card with the syndicate's logo. There's something written on the back. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 1db5fe6746..736642abb5 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -637,7 +637,7 @@ job: AtmosphericTechnician - type: entity - parent: IDCardStandard + parent: [ IDCardStandard, BaseSyndicateContraband ] id: SyndicateIDCard name: syndicate ID card components: @@ -650,7 +650,7 @@ - SyndicateAgent - type: entity - parent: IDCardStandard + parent: [ IDCardStandard, BaseMajorContraband ] id: PirateIDCard name: pirate ID card components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml index e188794b81..c2f7bef65b 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml @@ -97,7 +97,7 @@ - type: entity id: DefibrillatorSyndicate - parent: DefibrillatorCompact + parent: [ DefibrillatorCompact, BaseSyndicateContraband ] name: interdyne defibrillator description: Doubles as a self-defense weapon against war-crime inclined tiders. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml index ab071c7a18..d571fa85a5 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: BaseItem + parent: [ BaseItem, BaseSecurityContraband ] id: BaseMagazineBoxAntiMateriel name: ammunition box (.60 anti-materiel) components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml index de75ae4be4..204302b395 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml @@ -53,7 +53,7 @@ - type: entity id: FireAxeFlaming name: fire axe - parent: [BaseSyndicateContraband, FireAxe] + parent: [ BaseSyndicateContraband, FireAxe ] description: Why fight fire with an axe when you can fight with fire and axe? Now featuring rugged rubberized handle! components: - type: MeleeWeapon