From 50a7cda544711979805a5c11f5809ed62dfe3feb Mon Sep 17 00:00:00 2001 From: Krosus777 <38509947+Krosus777@users.noreply.github.com> Date: Thu, 10 Sep 2026 01:42:35 +0200 Subject: [PATCH 1/5] =?UTF-8?q?=D0=9A=D0=BE=D1=80=D0=B2=D0=B0=D0=BA=D1=81?= =?UTF-8?q?=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=B0=D0=B1=D0=B0=D0=BD=D0=B4?= =?UTF-8?q?=D0=B0=20(#3725)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Dmitry <57028746+DIMMoon1@users.noreply.github.com> --- Content.Shared/Contraband/ContrabandSystem.cs | 12 +- Resources/ConfigPresets/Corvax/mrp.toml | 2 +- .../contraband/corvax-contraband-severity.ftl | 23 + .../ru-RU/contraband/contraband-severity.ftl | 2 +- .../contraband/corvax-contraband-severity.ftl | 23 + .../Catalog/Fills/Crates/syndicate.yml | 4 +- .../Corvax/Entities/Clothing/Head/hats.yml | 4 +- .../Entities/Clothing/OuterClothing/coats.yml | 4 +- .../Entities/Clothing/OuterClothing/suits.yml | 2 +- .../Entities/Clothing/OuterClothing/vests.yml | 6 +- .../Entities/Clothing/Uniforms/jumpskirts.yml | 8 +- .../Entities/Clothing/Uniforms/jumpsuits.yml | 8 +- .../Corvax/Entities/Objects/Devices/pda.yml | 10 +- .../Corvax/Entities/Objects/Misc/pen.yml | 4 + .../Prototypes/Corvax/base_contraband.yml | 633 ++++++++++++++++++ .../Corvax/contraband_severities.yml | 83 +++ .../Entities/Clothing/Back/smuggler.yml | 2 +- .../Entities/Clothing/Belt/belts.yml | 4 +- .../Entities/Clothing/Eyes/glasses.yml | 6 +- .../Prototypes/Entities/Clothing/Eyes/hud.yml | 10 +- .../Entities/Clothing/Hands/colored.yml | 2 +- .../Entities/Clothing/Hands/gloves.yml | 4 +- .../Entities/Clothing/Head/eva-helmets.yml | 2 +- .../Entities/Clothing/Head/hats.yml | 34 +- .../Entities/Clothing/Head/helmets.yml | 22 +- .../Entities/Clothing/Head/scraphelmet.yml | 2 +- .../Entities/Clothing/Head/soft.yml | 8 +- .../Entities/Clothing/Head/welding.yml | 2 +- .../Entities/Clothing/Masks/masks.yml | 6 +- .../Entities/Clothing/Multiple/towel.yml | 2 +- .../Entities/Clothing/Neck/cloaks.yml | 18 +- .../Entities/Clothing/Neck/mantles.yml | 12 +- .../Entities/Clothing/Neck/stoles.yml | 6 + .../Entities/Clothing/OuterClothing/armor.yml | 34 +- .../Entities/Clothing/OuterClothing/coats.yml | 22 +- .../Clothing/OuterClothing/hardsuits.yml | 26 +- .../Entities/Clothing/OuterClothing/misc.yml | 8 +- .../Clothing/OuterClothing/scraparmor.yml | 2 +- .../Clothing/OuterClothing/softsuits.yml | 2 +- .../Clothing/OuterClothing/wintercoats.yml | 38 +- .../Entities/Clothing/Shoes/magboots.yml | 4 +- .../Clothing/Uniforms/Jumpskirts/cargo.yml | 6 +- .../Clothing/Uniforms/Jumpskirts/command.yml | 6 +- .../Uniforms/Jumpskirts/engineering.yml | 10 +- .../Clothing/Uniforms/Jumpskirts/medical.yml | 10 +- .../Clothing/Uniforms/Jumpskirts/science.yml | 6 +- .../Clothing/Uniforms/Jumpskirts/security.yml | 20 +- .../Clothing/Uniforms/Jumpskirts/service.yml | 6 +- .../Clothing/Uniforms/Jumpsuits/cargo.yml | 10 +- .../Clothing/Uniforms/Jumpsuits/centcomm.yml | 26 +- .../Clothing/Uniforms/Jumpsuits/command.yml | 6 +- .../Uniforms/Jumpsuits/engineering.yml | 14 +- .../Clothing/Uniforms/Jumpsuits/medical.yml | 10 +- .../Clothing/Uniforms/Jumpsuits/science.yml | 6 +- .../Clothing/Uniforms/Jumpsuits/security.yml | 22 +- .../Clothing/Uniforms/Jumpsuits/service.yml | 6 +- .../Entities/Mobs/Cyborgs/borg_chassis.yml | 2 +- .../Prototypes/Entities/Mobs/NPCs/animals.yml | 2 +- .../Objects/Consumable/Food/produce.yml | 12 +- .../Smokeables/Cigarettes/packs.yml | 2 +- .../Circuitboards/Machine/production.yml | 6 +- .../Devices/Circuitboards/computer.yml | 8 +- .../Devices/Circuitboards/law_boards.yml | 2 +- .../Syndicate_Gadgets/chimp_upgrade_kit.yml | 2 +- .../Syndicate_Gadgets/singularity_beacon.yml | 2 +- .../Entities/Objects/Devices/cartridges.yml | 6 +- .../Objects/Devices/forensic_scanner.yml | 2 +- .../Entities/Objects/Devices/pda.yml | 190 +++++- .../Entities/Objects/Devices/pinpointer.yml | 2 +- .../Entities/Objects/Devices/radio.yml | 2 +- .../Prototypes/Entities/Objects/Fun/darts.yml | 2 +- .../Prototypes/Entities/Objects/Fun/pai.yml | 2 +- .../Entities/Objects/Magic/books.yml | 4 +- .../Entities/Objects/Misc/bedsheets.yml | 2 +- .../Entities/Objects/Misc/business_card.yml | 2 +- .../Entities/Objects/Misc/handcuffs.yml | 2 +- .../Objects/Misc/identification_cards.yml | 2 +- .../Entities/Objects/Misc/implanters.yml | 2 +- .../Objects/Misc/improvised_gun_parts.yml | 4 +- .../Prototypes/Entities/Objects/Misc/pen.yml | 12 + .../Entities/Objects/Misc/rubber_stamp.yml | 2 +- .../Objects/Misc/subdermal_implants.yml | 18 +- .../Entities/Objects/Power/powersink.yml | 2 +- .../Objects/Specific/Chapel/bibles.yml | 2 +- .../Objects/Specific/Hydroponics/leaves.yml | 2 +- .../Objects/Specific/Hydroponics/seeds.yml | 2 +- .../Objects/Specific/Hydroponics/tools.yml | 10 +- .../Objects/Specific/Janitorial/soap.yml | 2 +- .../Entities/Objects/Specific/Mech/mechs.yml | 6 + .../Objects/Specific/Medical/defib.yml | 2 +- .../Objects/Specific/Medical/surgery.yml | 10 +- .../Objects/Specific/Research/anomaly.yml | 4 +- .../Xenoarchaeology/item_xenoartifacts.yml | 2 +- .../Specific/Xenoarchaeology/node_scanner.yml | 2 +- .../structure_xenoartifacts.yml | 2 +- .../Entities/Objects/Specific/syndicate.yml | 4 +- .../Entities/Objects/Tools/decoys.yml | 2 +- .../Entities/Objects/Tools/jaws_of_life.yml | 2 +- .../Entities/Objects/Tools/lantern.yml | 2 +- .../Entities/Objects/Tools/lighters.yml | 6 +- .../Entities/Objects/Tools/thief.yml | 4 +- .../Entities/Objects/Tools/tools.yml | 8 +- .../Entities/Objects/Tools/welders.yml | 2 +- .../Entities/Objects/Weapons/Bombs/funny.yml | 2 +- .../Objects/Weapons/Bombs/plastic.yml | 2 +- .../Guns/Ammunition/Boxes/antimateriel.yml | 2 +- .../Guns/Ammunition/Boxes/caseless_rifle.yml | 2 +- .../Guns/Ammunition/Boxes/light_rifle.yml | 2 +- .../Weapons/Guns/Ammunition/Boxes/magnum.yml | 2 +- .../Weapons/Guns/Ammunition/Boxes/pistol.yml | 2 +- .../Weapons/Guns/Ammunition/Boxes/rifle.yml | 2 +- .../Ammunition/Cartridges/caseless_rifle.yml | 2 +- .../Ammunition/Cartridges/heavy_rifle.yml | 2 +- .../Ammunition/Cartridges/light_rifle.yml | 2 +- .../Guns/Ammunition/Cartridges/magnum.yml | 2 +- .../Guns/Ammunition/Cartridges/pistol.yml | 2 +- .../Guns/Ammunition/Cartridges/rifle.yml | 2 +- .../Guns/Ammunition/Cartridges/shotgun.yml | 2 +- .../Ammunition/Magazines/caseless_rifle.yml | 2 +- .../Guns/Ammunition/Magazines/light_rifle.yml | 2 +- .../Guns/Ammunition/Magazines/pistol.yml | 6 +- .../Guns/Ammunition/Magazines/rifle.yml | 2 +- .../Guns/Ammunition/Magazines/shotgun.yml | 2 +- .../Guns/Ammunition/SpeedLoaders/magnum.yml | 2 +- .../Objects/Weapons/Guns/Basic/base_staff.yml | 2 +- .../Weapons/Guns/Basic/energy_crossbow.yml | 2 +- .../Objects/Weapons/Guns/Basic/pka.yml | 2 +- .../Weapons/Guns/Battery/battery_guns.yml | 36 +- .../Entities/Objects/Weapons/Guns/Bow/bow.yml | 2 +- .../Objects/Weapons/Guns/HMGs/hmgs.yml | 2 +- .../Objects/Weapons/Guns/LMGs/lmgs.yml | 2 +- .../Weapons/Guns/Launchers/launchers.yml | 8 +- .../Objects/Weapons/Guns/Pistols/pistols.yml | 8 +- .../Weapons/Guns/Revolvers/revolvers.yml | 14 +- .../Objects/Weapons/Guns/Rifles/rifles.yml | 6 +- .../Objects/Weapons/Guns/SMGs/smgs.yml | 10 +- .../Weapons/Guns/Shotguns/shotguns.yml | 18 +- .../Objects/Weapons/Guns/Snipers/snipers.yml | 8 +- .../Guns/Turrets/turrets_ballistic.yml | 2 +- .../Objects/Weapons/Guns/pneumatic_cannon.yml | 4 +- .../Objects/Weapons/Melee/baguette.yml | 2 +- .../Entities/Objects/Weapons/Melee/cane.yml | 2 +- .../Objects/Weapons/Melee/e_sword.yml | 9 +- .../Entities/Objects/Weapons/Melee/knife.yml | 19 +- .../Entities/Objects/Weapons/Melee/mining.yml | 6 +- .../Objects/Weapons/Melee/stunprod.yml | 2 +- .../Entities/Objects/Weapons/Melee/sword.yml | 4 +- .../Objects/Weapons/Throwable/bola.yml | 2 +- .../Weapons/Throwable/canister_grenades.yml | 2 +- .../Objects/Weapons/Throwable/croissant.yml | 2 +- .../Objects/Weapons/Throwable/grenades.yml | 8 +- .../Weapons/Throwable/projectile_grenades.yml | 4 +- .../Weapons/Throwable/scattering_grenades.yml | 4 +- .../Entities/Objects/Weapons/security.yml | 4 +- .../Entities/Objects/base_contraband.yml | 38 +- .../Structures/Decoration/banners.yml | 4 +- .../Machines/Computers/computers.yml | 8 +- .../Structures/Machines/artifact_analyzer.yml | 2 +- .../Entities/Structures/Machines/bombs.yml | 2 +- .../Entities/Structures/Machines/lathe.yml | 4 +- .../Structures/Machines/vending_machines.yml | 2 +- .../Power/Generation/generators.yml | 6 + .../Structures/Storage/Closets/big_boxes.yml | 2 +- Resources/Prototypes/Magic/staves.yml | 2 +- .../Prototypes/Magic/teleport_scroll.yml | 2 +- .../Reagents/Consumable/Food/ingredients.yml | 1 + Resources/Prototypes/Reagents/biological.yml | 1 + Resources/Prototypes/Reagents/botany.yml | 7 + Resources/Prototypes/Reagents/chemicals.yml | 3 + Resources/Prototypes/Reagents/cleaning.yml | 1 + Resources/Prototypes/Reagents/elements.yml | 10 + Resources/Prototypes/Reagents/fun.yml | 4 +- Resources/Prototypes/Reagents/gases.yml | 3 + Resources/Prototypes/Reagents/medicine.yml | 7 + Resources/Prototypes/Reagents/narcotics.yml | 16 +- Resources/Prototypes/Reagents/pyrotechnic.yml | 8 +- Resources/Prototypes/Reagents/toxins.yml | 34 +- 177 files changed, 1556 insertions(+), 495 deletions(-) create mode 100644 Resources/Locale/en-US/contraband/corvax-contraband-severity.ftl create mode 100644 Resources/Locale/ru-RU/contraband/corvax-contraband-severity.ftl create mode 100644 Resources/Prototypes/Corvax/base_contraband.yml create mode 100644 Resources/Prototypes/Corvax/contraband_severities.yml diff --git a/Content.Shared/Contraband/ContrabandSystem.cs b/Content.Shared/Contraband/ContrabandSystem.cs index 47f5c490e8..670d34ea32 100644 --- a/Content.Shared/Contraband/ContrabandSystem.cs +++ b/Content.Shared/Contraband/ContrabandSystem.cs @@ -68,17 +68,15 @@ public sealed partial class ContrabandSystem : EntitySystem // one, the actual informative 'this is restricted' // then, the 'you can/shouldn't carry this around' based on the ID the user is wearing var severity = ProtoMan.Index(component.Severity); - String departmentExamineMessage; + // Corvax start: show the article before the allowed departments and jobs. + var departmentExamineMessage = Loc.GetString(severity.ExamineText, + ("type", ContrabandItemType.Item), ("color", severity.Color.ToHex())); if (severity.ShowDepartmentsAndJobs) { - // department restricted text - departmentExamineMessage = + departmentExamineMessage += "\n" + GenerateDepartmentExamineMessage(component.AllowedDepartments, component.AllowedJobs, severity.Color); } - else - { - departmentExamineMessage = Loc.GetString(severity.ExamineText, ("type", ContrabandItemType.Item), ("color", severity.Color.ToHex())); - } + // Corvax end // if it is fully restricted, you're department-less, or your department isn't in the allowed list, you cannot carry it. Otherwise, you can. var carryingMessage = Loc.GetString("contraband-examine-text-in-the-clear"); diff --git a/Resources/ConfigPresets/Corvax/mrp.toml b/Resources/ConfigPresets/Corvax/mrp.toml index 3c38118897..9ff033d465 100644 --- a/Resources/ConfigPresets/Corvax/mrp.toml +++ b/Resources/ConfigPresets/Corvax/mrp.toml @@ -2,7 +2,7 @@ fallbackpreset = "extended" lobbyenabled = true role_timers = true -contraband_examine = false +# contraband_examine = false [ic] flavor_text = true diff --git a/Resources/Locale/en-US/contraband/corvax-contraband-severity.ftl b/Resources/Locale/en-US/contraband/corvax-contraband-severity.ftl new file mode 100644 index 0000000000..43c50aac8e --- /dev/null +++ b/Resources/Locale/en-US/contraband/corvax-contraband-severity.ftl @@ -0,0 +1,23 @@ +# Legality categories; identification and contextual exceptions remain roleplay rules. + +contraband-examine-text-Corvax131 = [color={ $color }]Article 131: Propaganda of prohibited organizations.[/color] + +contraband-examine-text-Corvax431 = [color={ $color }]Article 431: Misuse of equipment.[/color] + +contraband-examine-text-Corvax432 = [color={ $color }]Article 432: Unlawful possession of dangerous items.[/color] + +contraband-examine-text-Corvax433 = [color={ $color }]Article 433: Violation of regulated item possession rules.[/color] + +contraband-examine-text-Corvax434 = [color={ $color }]Article 434: Unlawful possession of restricted-circulation items.[/color] + +contraband-examine-text-Corvax435 = [color={ $color }]Article 435: Unlawful possession of contraband items.[/color] + +contraband-examine-text-Corvax436 = [color={ $color }]Article 436: Unlawful possession of terrorist equipment.[/color] + +contraband-examine-text-Corvax442 = [color={ $color }]Article 442: Basic chemical elements, household substances with pronounced adverse effects at safe doses, and mild narcotics.[/color] + +contraband-examine-text-Corvax443 = [color={ $color }]Article 443: Complex medicines.[/color] + +contraband-examine-text-Corvax444 = [color={ $color }]Article 444: Toxic substances, potent narcotics and explosive substances.[/color] + +contraband-examine-text-Corvax445 = [color={ $color }]Article 445: Critically dangerous toxins, chemicals, narcotics, stimulants, anomalous and magical liquids, and species mutagens.[/color] diff --git a/Resources/Locale/ru-RU/contraband/contraband-severity.ftl b/Resources/Locale/ru-RU/contraband/contraband-severity.ftl index dd8b09aa06..2c80a102a6 100644 --- a/Resources/Locale/ru-RU/contraband/contraband-severity.ftl +++ b/Resources/Locale/ru-RU/contraband/contraband-severity.ftl @@ -47,7 +47,7 @@ contraband-examine-text-Magical = } contraband-examine-text-avoid-carrying-around = [color=red][italic]Вам, вероятно, не стоит носить его с собой без веской причины.[/italic][/color] -contraband-examine-text-in-the-clear = [color=green][italic]Вы должны быть чисты, чтобы носить этот предмет на виду.[/italic][/color] +contraband-examine-text-in-the-clear = [color=green][italic]Вам ничто не мешает носить это на виду.[/italic][/color] contraband-examinable-verb-text = Легальность contraband-examinable-verb-message = Проверить легальность этого предмета. diff --git a/Resources/Locale/ru-RU/contraband/corvax-contraband-severity.ftl b/Resources/Locale/ru-RU/contraband/corvax-contraband-severity.ftl new file mode 100644 index 0000000000..85b7ee7698 --- /dev/null +++ b/Resources/Locale/ru-RU/contraband/corvax-contraband-severity.ftl @@ -0,0 +1,23 @@ +# Legality categories; identification and contextual exceptions remain roleplay rules. + +contraband-examine-text-Corvax131 = [color={ $color }]Статья 131: Пропаганда запрещённых организаций.[/color] + +contraband-examine-text-Corvax431 = [color={ $color }]Статья 431: Злоупотребление экипировкой.[/color] + +contraband-examine-text-Corvax432 = [color={ $color }]Статья 432: Незаконное владение опасными предметами.[/color] + +contraband-examine-text-Corvax433 = [color={ $color }]Статья 433: Нарушение порядка владения регулируемыми предметами.[/color] + +contraband-examine-text-Corvax434 = [color={ $color }]Статья 434: Незаконное владение предметами ограниченного оборота.[/color] + +contraband-examine-text-Corvax435 = [color={ $color }]Статья 435: Незаконное владение контрабандными предметами.[/color] + +contraband-examine-text-Corvax436 = [color={ $color }]Статья 436: Незаконное владение террористическими средствами.[/color] + +contraband-examine-text-Corvax442 = [color={ $color }]Статья 442: Базовые химические элементы, хозяйственные вещества, у которых имеется выраженный отрицательный эффект в безопасных дозах и слабые наркотические вещества.[/color] + +contraband-examine-text-Corvax443 = [color={ $color }]Статья 443: Сложные лекарственные препараты.[/color] + +contraband-examine-text-Corvax444 = [color={ $color }]Статья 444: Токсичные вещества, сильнодействующие наркотики и взрывоопасные вещества.[/color] + +contraband-examine-text-Corvax445 = [color={ $color }]Статья 445: Критически опасные токсины, химикаты, наркотические вещества, стимуляторы, аномальные и магические жидкости, расовые мутагены.[/color] diff --git a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml index 403afaaf74..626bc0b06f 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml @@ -1,5 +1,5 @@ - type: entity - parent: [ CrateSyndicate, StorePresetUplink, BaseSyndicateContraband ] + parent: [CrateSyndicate, StorePresetUplink] # Corvax-Contraband id: CrateSyndicateSurplusBundle name: Syndicate surplus crate description: Contains 50 telecrystals worth of completely random Syndicate items. It can be useless junk or really good. @@ -23,7 +23,7 @@ tableId: SyndicateHardsuitExtrasEntityTable - type: entity - parent: [ CrateSyndicate, StorePresetUplink, BaseSyndicateContraband ] + parent: [CrateSyndicate, StorePresetUplink] # Corvax-Contraband id: CrateSyndicateSuperSurplusBundle name: Syndicate super surplus crate description: Contains 125 telecrystals worth of completely random Syndicate items. diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Head/hats.yml index befcf91e82..7ff4f7e47b 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Head/hats.yml @@ -65,7 +65,7 @@ sprite: Corvax/Clothing/Head/Hats/warden_alt.rsi - type: entity - parent: ClothingHeadBase + parent: [BaseCorvaxContraband431JobsBrigmedic, ClothingHeadBase] # Corvax-Contraband id: ClothingHeadHatBeretSecurityMedic name: security medic beret description: A robust beret with the medical insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection. @@ -87,7 +87,7 @@ sprite: Corvax/Clothing/Head/Hats/caphat.rsi - type: entity - parent: ClothingHeadBase + parent: [BaseCorvaxContraband431JobsPilot, ClothingHeadBase] # Corvax-Contraband id: ClothingHeadHatBeretSecurityPilot name: pilot beret description: Black beret with a silver badge. diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml index 126847d593..6d5f1967bc 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml @@ -53,7 +53,7 @@ Heat: 0.8 - type: entity - parent: ClothingOuterStorageBase + parent: [BaseCorvaxContraband431JobsSecurityOfficer, ClothingOuterStorageBase] # Corvax-Contraband id: ClothingOuterCoatSecurityOvercoat name: security overcoat description: Lightly armored leather overcoat meant as casual wear for high-ranking officers. Bears the crest of Nanotrasen Security. @@ -71,7 +71,7 @@ Heat: 0.9 - type: entity - parent: ClothingOuterStorageBase + parent: [BaseCorvaxContraband431JobsBrigmedic, ClothingOuterStorageBase] # Corvax-Contraband id: ClothingOuterCoatLabSecurityMedic name: security medic labcoat description: A suit that protects against minor chemical spills. diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/suits.yml index a3e475d6e4..dbf441b6eb 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/suits.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/suits.yml @@ -21,7 +21,7 @@ sprite: Corvax/Clothing/OuterClothing/Coats/disco.rsi - type: entity - parent: ClothingOuterStorageBase + parent: [BaseCorvaxContraband431JobsAtmosphericTechnician, ClothingOuterStorageBase] # Corvax-Contraband id: ClothingAtmosphericsOveralls name: atmospherics overalls description: A set of fireproof overalls, good for protecting thinner clothes from gas leaks. diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/vests.yml index 42b00999eb..7e6aba9d91 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/vests.yml @@ -15,13 +15,17 @@ name: security medic armor vest description: A security medic's armor vest, with little pockets for little things. components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [Security] + allowedJobs: [Brigmedic] - type: Sprite sprite: Corvax/Clothing/OuterClothing/Vests/armor_sec_med.rsi - type: Clothing sprite: Corvax/Clothing/OuterClothing/Vests/armor_sec_med.rsi - type: entity - parent: ClothingOuterBase + parent: [BaseCorvaxContraband431JobsBrigmedic, ClothingOuterBase] # Corvax-Contraband id: ClothingOuterVestSecurityMedic name: security medic vest description: A lightweight vest worn by the Security Medic. diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml index e4a87b4db3..4d4c521b4b 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml @@ -44,7 +44,7 @@ sprite: Corvax/Clothing/Uniforms/Jumpskirt/schoolskirt.rsi - type: entity - parent: ClothingUniformBase + parent: [BaseCorvaxContraband431JobsCaptain, ClothingUniformBase] # Corvax-Contraband id: ClothingUniformJumpskirtCapTurtleneck name: captain's turtleneck description: True captain's turtleneck. @@ -55,7 +55,7 @@ sprite: Corvax/Clothing/Uniforms/Jumpskirt/cap_turtleneck.rsi - type: entity - parent: ClothingUniformBase + parent: [BaseCorvaxContraband431JobsHeadOfPersonnel, ClothingUniformBase] # Corvax-Contraband id: ClothingUniformJumpskirtHoPTurtleneck name: head of personal's turtleneck description: It's Head of Personal's turtleneck. @@ -66,7 +66,7 @@ sprite: Corvax/Clothing/Uniforms/Jumpskirt/hop_turtleneck.rsi - type: entity - parent: ClothingUniformBase + parent: [BaseCorvaxContraband431JobsHeadOfSecurity, ClothingUniformBase] # Corvax-Contraband id: ClothingUniformJumpskirtHoSBlack name: head of security's black skirt description: It's Head of Security's black skirt. @@ -77,7 +77,7 @@ sprite: Corvax/Clothing/Uniforms/Jumpskirt/hos_black.rsi - type: entity - parent: ClothingUniformBase + parent: [BaseCorvaxContraband431JobsResearchDirector, ClothingUniformBase] # Corvax-Contraband id: ClothingUniformJumpskirtRDClassical name: research director's classical skirt description: It's Research Director's classical skirt. diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpsuits.yml index 8b3cdf6cdf..60f4549e31 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpsuits.yml @@ -43,7 +43,7 @@ sprite: Corvax/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi - type: entity - parent: ClothingUniformBase + parent: [BaseCorvaxContraband431JobsCaptain, ClothingUniformBase] # Corvax-Contraband id: ClothingUniformJumpsuitCapTurtleneck name: captain's turtleneck description: True captain's turtleneck. @@ -54,7 +54,7 @@ sprite: Corvax/Clothing/Uniforms/Jumpsuit/cap_turtleneck.rsi - type: entity - parent: ClothingUniformBase + parent: [BaseCorvaxContraband431JobsHeadOfPersonnel, ClothingUniformBase] # Corvax-Contraband id: ClothingUniformJumpsuitHoPTurtleneck name: head of personal's turtleneck description: It's Head of Personal's turtleneck. @@ -65,7 +65,7 @@ sprite: Corvax/Clothing/Uniforms/Jumpsuit/hop_turtleneck.rsi - type: entity - parent: ClothingUniformBase + parent: [BaseCorvaxContraband431JobsHeadOfSecurity, ClothingUniformBase] # Corvax-Contraband id: ClothingUniformJumpsuitHoSBlack name: head of security's black suit description: It's Head of Security's black suit. @@ -76,7 +76,7 @@ sprite: Corvax/Clothing/Uniforms/Jumpsuit/hos_black.rsi - type: entity - parent: ClothingUniformBase + parent: [BaseCorvaxContraband431JobsResearchDirector, ClothingUniformBase] # Corvax-Contraband id: ClothingUniformJumpsuitRDClassical name: research director's classical suit description: It's Research Director's сlassical suit. diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Corvax/Entities/Objects/Devices/pda.yml index 4e9a4a0e43..86748f13e5 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Devices/pda.yml @@ -4,6 +4,10 @@ name: internal affairs agent PDA description: Corporation and profit are best friends. components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [IAA] - type: Pda id: IAAIDCard penSlot: @@ -19,7 +23,7 @@ state: pda-lawyer - type: entity - parent: BaseSecurityPDA + parent: [BaseCorvaxContraband431JobsPilot, BaseSecurityPDA] # Corvax-Contraband id: PilotPDA name: pilot PDA description: Нas protection from cosmic radiation. @@ -53,6 +57,10 @@ name: magistrate's PDA description: Corporation and profit are best friends. components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [Magistrate] - type: Sprite sprite: Corvax/Objects/Devices/pda.rsi state: pda-magistrate diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Misc/pen.yml b/Resources/Prototypes/Corvax/Entities/Objects/Misc/pen.yml index 68a56feea0..407b06eb3c 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Misc/pen.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Misc/pen.yml @@ -4,6 +4,10 @@ id: PenLegal description: Writes sentences and more. components: + - type: Contraband + severity: Corvax432 + allowedDepartments: [Legal, CentralCommand] + allowedJobs: [] - type: Sprite sprite: Corvax/Objects/Misc/pens.rsi state: legal_pen diff --git a/Resources/Prototypes/Corvax/base_contraband.yml b/Resources/Prototypes/Corvax/base_contraband.yml new file mode 100644 index 0000000000..14a52d6487 --- /dev/null +++ b/Resources/Prototypes/Corvax/base_contraband.yml @@ -0,0 +1,633 @@ +# Corvax-Contraband: reusable article and permission combinations. +# Put these before functional parents so their explicit permissions take precedence. +# Keep empty permission lists: another parent must not add unintended exemptions. + +- type: entity + id: BaseCorvaxContraband131 + abstract: true + components: + - type: Contraband + severity: Corvax131 + allowedDepartments: [] + allowedJobs: [] + +- type: entity + id: BaseCorvaxContraband431JobsAtmosphericTechnician + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [AtmosphericTechnician] + +- type: entity + id: BaseCorvaxContraband431JobsAtmosphericTechnicianSeniorEngineer + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [AtmosphericTechnician, SeniorEngineer] + +- type: entity + id: BaseCorvaxContraband431JobsBartender + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [Bartender] + +- type: entity + id: BaseCorvaxContraband431JobsBotanist + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [Botanist] + +- type: entity + id: BaseCorvaxContraband431JobsBrigmedic + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [Brigmedic] + +- type: entity + id: BaseCorvaxContraband431JobsCaptain + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [Captain] + +- type: entity + id: BaseCorvaxContraband431JobsCargoTechnician + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [CargoTechnician] + +- type: entity + id: BaseCorvaxContraband431JobsChaplain + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [Chaplain] + +- type: entity + id: BaseCorvaxContraband431JobsChef + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [Chef] + +- type: entity + id: BaseCorvaxContraband431JobsChemist + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [Chemist] + +- type: entity + id: BaseCorvaxContraband431JobsChiefEngineer + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [ChiefEngineer] + +- type: entity + id: BaseCorvaxContraband431JobsChiefMedicalOfficer + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [ChiefMedicalOfficer] + +- type: entity + id: BaseCorvaxContraband431JobsDetective + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [Detective] + +- type: entity + id: BaseCorvaxContraband431JobsHeadOfPersonnel + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [HeadOfPersonnel] + +- type: entity + id: BaseCorvaxContraband431JobsHeadOfSecurity + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [HeadOfSecurity] + +- type: entity + id: BaseCorvaxContraband431JobsJanitor + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [Janitor] + +- type: entity + id: BaseCorvaxContraband431JobsMedicalDoctor + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [MedicalDoctor] + +- type: entity + id: BaseCorvaxContraband431JobsParamedic + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [Paramedic] + +- type: entity + id: BaseCorvaxContraband431JobsPilot + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [Pilot] + +- type: entity + id: BaseCorvaxContraband431JobsQuartermaster + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [Quartermaster] + +- type: entity + id: BaseCorvaxContraband431JobsResearchDirector + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [ResearchDirector] + +- type: entity + id: BaseCorvaxContraband431JobsSalvageSpecialist + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [SalvageSpecialist] + +- type: entity + id: BaseCorvaxContraband431JobsScientist + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [Scientist] + +- type: entity + id: BaseCorvaxContraband431JobsScientistSeniorResearcher + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [Scientist, SeniorResearcher] + +- type: entity + id: BaseCorvaxContraband431JobsSecurityOfficer + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [SecurityOfficer] + +- type: entity + id: BaseCorvaxContraband431JobsSecurityOfficerSeniorOfficer + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [SecurityOfficer, SeniorOfficer] + +- type: entity + id: BaseCorvaxContraband431JobsSeniorEngineerStationEngineer + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [SeniorEngineer, StationEngineer] + +- type: entity + id: BaseCorvaxContraband431JobsStationEngineer + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [StationEngineer] + +- type: entity + id: BaseCorvaxContraband431JobsWarden + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [Warden] + +- type: entity + id: BaseCorvaxContraband431DepartmentsCentralCommand + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [CentralCommand] + allowedJobs: [] + +- type: entity + id: BaseCorvaxContraband431DepartmentsCentralCommandJobsCentralCommandOfficial + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [CentralCommand] + allowedJobs: [CentralCommandOfficial] + +- type: entity + id: BaseCorvaxContraband431DepartmentsCommandJobsCaptain + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [Command] + allowedJobs: [Captain] + +- type: entity + id: BaseCorvaxContraband431DepartmentsCommandJobsChiefEngineer + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [Command] + allowedJobs: [ChiefEngineer] + +- type: entity + id: BaseCorvaxContraband431DepartmentsCommandJobsChiefMedicalOfficer + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [Command] + allowedJobs: [ChiefMedicalOfficer] + +- type: entity + id: BaseCorvaxContraband431DepartmentsCommandJobsHeadOfPersonnel + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [Command] + allowedJobs: [HeadOfPersonnel] + +- type: entity + id: BaseCorvaxContraband431DepartmentsCommandJobsHeadOfSecurity + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [Command] + allowedJobs: [HeadOfSecurity] + +- type: entity + id: BaseCorvaxContraband431DepartmentsCommandJobsQuartermaster + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [Command] + allowedJobs: [Quartermaster] + +- type: entity + id: BaseCorvaxContraband431DepartmentsCommandJobsResearchDirector + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [Command] + allowedJobs: [ResearchDirector] + +- type: entity + id: BaseCorvaxContraband431DepartmentsCommandSecurityJobsHeadOfSecurity + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [Command, Security] + allowedJobs: [HeadOfSecurity] + +- type: entity + id: BaseCorvaxContraband431DepartmentsEngineering + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [Engineering] + allowedJobs: [] + +- type: entity + id: BaseCorvaxContraband431DepartmentsEngineeringSecurity + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [Engineering, Security] + allowedJobs: [] + +- type: entity + id: BaseCorvaxContraband431DepartmentsMedical + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [Medical] + allowedJobs: [] + +- type: entity + id: BaseCorvaxContraband431DepartmentsScience + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [Science] + allowedJobs: [] + +- type: entity + id: BaseCorvaxContraband431DepartmentsSecurity + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [Security] + allowedJobs: [] + +- type: entity + id: BaseCorvaxContraband431DepartmentsSecurityJobsBrigmedicDetectiveSecurityOfficerSeniorOfficer + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [Security] + allowedJobs: [Brigmedic, Detective, SecurityOfficer, SeniorOfficer] + +- type: entity + id: BaseCorvaxContraband431DepartmentsSecurityJobsDetective + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [Security] + allowedJobs: [Detective] + +- type: entity + id: BaseCorvaxContraband431DepartmentsSecurityJobsSecurityCadetSecurityOfficer + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [Security] + allowedJobs: [SecurityCadet, SecurityOfficer] + +- type: entity + id: BaseCorvaxContraband431DepartmentsSecurityJobsSecurityOfficer + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [Security] + allowedJobs: [SecurityOfficer] + +- type: entity + id: BaseCorvaxContraband431DepartmentsSecurityJobsSecurityOfficerSeniorOfficer + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [Security] + allowedJobs: [SecurityOfficer, SeniorOfficer] + +- type: entity + id: BaseCorvaxContraband431DepartmentsSecurityJobsWarden + abstract: true + components: + - type: Contraband + severity: Corvax431 + allowedDepartments: [Security] + allowedJobs: [Warden] + +- type: entity + id: BaseCorvaxContraband432JobsBotanist + abstract: true + components: + - type: Contraband + severity: Corvax432 + allowedDepartments: [] + allowedJobs: [Botanist] + +- type: entity + id: BaseCorvaxContraband432JobsChef + abstract: true + components: + - type: Contraband + severity: Corvax432 + allowedDepartments: [] + allowedJobs: [Chef] + +- type: entity + id: BaseCorvaxContraband432DepartmentsCargo + abstract: true + components: + - type: Contraband + severity: Corvax432 + allowedDepartments: [Cargo] + allowedJobs: [] + +- type: entity + id: BaseCorvaxContraband432DepartmentsCargoSecurity + abstract: true + components: + - type: Contraband + severity: Corvax432 + allowedDepartments: [Cargo, Security] + allowedJobs: [] + +- type: entity + id: BaseCorvaxContraband432DepartmentsCentralCommand + abstract: true + components: + - type: Contraband + severity: Corvax432 + allowedDepartments: [CentralCommand] + allowedJobs: [] + +- type: entity + id: BaseCorvaxContraband432DepartmentsCommandSecurity + abstract: true + components: + - type: Contraband + severity: Corvax432 + allowedDepartments: [Command, Security] + allowedJobs: [] + +- type: entity + id: BaseCorvaxContraband432DepartmentsMedical + abstract: true + components: + - type: Contraband + severity: Corvax432 + allowedDepartments: [Medical] + allowedJobs: [] + +- type: entity + id: BaseCorvaxContraband432DepartmentsScience + abstract: true + components: + - type: Contraband + severity: Corvax432 + allowedDepartments: [Science] + allowedJobs: [] + +- type: entity + id: BaseCorvaxContraband432DepartmentsSecurity + abstract: true + components: + - type: Contraband + severity: Corvax432 + allowedDepartments: [Security] + allowedJobs: [] + +- type: entity + id: BaseCorvaxContraband433DepartmentsCommand + abstract: true + components: + - type: Contraband + severity: Corvax433 + allowedDepartments: [Command] + allowedJobs: [] + +- type: entity + id: BaseCorvaxContraband433DepartmentsCommandSecurity + abstract: true + components: + - type: Contraband + severity: Corvax433 + allowedDepartments: [Command, Security] + allowedJobs: [] + +- type: entity + id: BaseCorvaxContraband433DepartmentsSecurity + abstract: true + components: + - type: Contraband + severity: Corvax433 + allowedDepartments: [Security] + allowedJobs: [] + +- type: entity + id: BaseCorvaxContraband434DepartmentsCentralCommand + abstract: true + components: + - type: Contraband + severity: Corvax434 + allowedDepartments: [CentralCommand] + allowedJobs: [] + +- type: entity + id: BaseCorvaxContraband434DepartmentsCommand + abstract: true + components: + - type: Contraband + severity: Corvax434 + allowedDepartments: [Command] + allowedJobs: [] + +- type: entity + id: BaseCorvaxContraband434DepartmentsScience + abstract: true + components: + - type: Contraband + severity: Corvax434 + allowedDepartments: [Science] + allowedJobs: [] + +- type: entity + id: BaseCorvaxContraband434DepartmentsSecurity + abstract: true + components: + - type: Contraband + severity: Corvax434 + allowedDepartments: [Security] + allowedJobs: [] + +- type: entity + id: BaseCorvaxContraband434DepartmentsSecurityJobsBartender + abstract: true + components: + - type: Contraband + severity: Corvax434 + allowedDepartments: [Security] + allowedJobs: [Bartender] + +- type: entity + id: BaseCorvaxContraband435 + abstract: true + components: + - type: Contraband + severity: Corvax435 + allowedDepartments: [] + allowedJobs: [] + +- type: entity + id: BaseCorvaxContraband436 + abstract: true + components: + - type: Contraband + severity: Corvax436 + allowedDepartments: [] + allowedJobs: [] diff --git a/Resources/Prototypes/Corvax/contraband_severities.yml b/Resources/Prototypes/Corvax/contraband_severities.yml new file mode 100644 index 0000000000..90af5feb4a --- /dev/null +++ b/Resources/Prototypes/Corvax/contraband_severities.yml @@ -0,0 +1,83 @@ +# Corvax: localized contraband articles from the Station14 wiki (2026-09-06). +# https://station14.ru/wiki/Контрабанда +# Article numbers describe legality, not whether a character has identified an item. +# Identification, research, licenses and contextual exceptions remain roleplay rules. +# Corvax: XX1-XX5 use the corporate law table colors from the wiki dark theme. + +# 131: Propaganda of prohibited organizations. +- type: contrabandSeverity + id: Corvax131 + examineText: contraband-examine-text-Corvax131 + color: "#1A4B1E" + priority: 1 + +# 431: Misuse of professional equipment. +- type: contrabandSeverity + id: Corvax431 + examineText: contraband-examine-text-Corvax431 + showDepartmentsAndJobs: true + color: "#1A4B1E" + priority: 2 + +# 432: Dangerous items. +- type: contrabandSeverity + id: Corvax432 + examineText: contraband-examine-text-Corvax432 + color: "#564513" + priority: 3 + +# 433: Regulated items. +- type: contrabandSeverity + id: Corvax433 + examineText: contraband-examine-text-Corvax433 + color: "#652F0F" + priority: 4 + +# 434: Restricted-circulation items. +- type: contrabandSeverity + id: Corvax434 + examineText: contraband-examine-text-Corvax434 + color: "#65240F" + priority: 5 + +# 435: Contraband items. +- type: contrabandSeverity + id: Corvax435 + examineText: contraband-examine-text-Corvax435 + color: "#ff0000" + priority: 6 + +# 436: Terrorist equipment. +- type: contrabandSeverity + id: Corvax436 + examineText: contraband-examine-text-Corvax436 + color: darkred + priority: 7 + +# 442: Harmful basic chemicals and weak narcotics. +- type: contrabandSeverity + id: Corvax442 + examineText: contraband-examine-text-Corvax442 + color: "#564513" + priority: 3 + +# 443: Complex medicines. +- type: contrabandSeverity + id: Corvax443 + examineText: contraband-examine-text-Corvax443 + color: "#652F0F" + priority: 4 + +# 444: Toxins, strong narcotics and explosive chemicals. +- type: contrabandSeverity + id: Corvax444 + examineText: contraband-examine-text-Corvax444 + color: "#65240F" + priority: 5 + +# 445: Critical toxins, stimulants and mutagens. +- type: contrabandSeverity + id: Corvax445 + examineText: contraband-examine-text-Corvax445 + color: "#ff0000" + priority: 6 diff --git a/Resources/Prototypes/Entities/Clothing/Back/smuggler.yml b/Resources/Prototypes/Entities/Clothing/Back/smuggler.yml index bf39828627..5df747a949 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/smuggler.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/smuggler.yml @@ -29,7 +29,7 @@ bodyType: Static - type: entity - parent: [ BaseSubfloorAnchorStorageAnchored, ClothingBackpackSatchel, BaseMinorContraband ] + parent: [BaseSubfloorAnchorStorageAnchored, ClothingBackpackSatchel] # Corvax-Contraband id: ClothingBackpackSatchelSmuggler name: smuggler's satchel suffix: Empty diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 5d753136cb..06d9ae0603 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -111,7 +111,7 @@ ## Holsters - type: entity - parent: ClothingBeltStorageBase + parent: [BaseCorvaxContraband431DepartmentsSecurity, ClothingBeltStorageBase] # Corvax-Contraband id: ClothingBeltHolster name: shoulder holster description: 'A holster to carry a handgun and ammo. WARNING: Badasses only.' @@ -129,7 +129,7 @@ - 0,0,4,1 - type: entity - parent: [ClothingBeltStorageBase, BaseSyndicateContraband] + parent: [BaseCorvaxContraband431DepartmentsSecurity, ClothingBeltStorageBase, BaseSyndicateContraband] # Corvax-Contraband id: ClothingBeltSyndieHolster name: syndicate shoulder holster description: A deep shoulder holster capable of holding many types of ballistics. diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index ccb5777b2d..a44ffc8c39 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -166,7 +166,7 @@ - WhitelistChameleon - type: entity - parent: [ClothingEyesBase, ShowSecurityIcons, BaseSecurityContraband] + parent: [BaseCorvaxContraband433DepartmentsCommandSecurity, ClothingEyesBase, ShowSecurityIcons, BaseSecurityContraband] # Corvax-Contraband id: ClothingEyesGlassesSecurity name: security glasses description: Upgraded sunglasses that provide flash immunity and a security HUD. @@ -194,7 +194,7 @@ coverage: EYES - type: entity - parent: [ClothingEyesBase, BaseCommandContraband] + parent: [BaseCorvaxContraband433DepartmentsCommandSecurity, ClothingEyesBase, BaseCommandContraband] # Corvax-Contraband id: ClothingEyesGlassesCommand name: administration glasses description: Upgraded sunglasses that provide flash immunity and show ID card status. @@ -252,7 +252,7 @@ - type: ThermalSight - type: entity - parent: ClothingEyesBase + parent: [BaseCorvaxContraband431DepartmentsMedical, ClothingEyesBase] # Corvax-Contraband id: ClothingEyesGlassesChemical name: chemical analysis goggles description: Goggles that can scan the chemical composition of a solution. diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index 5628544557..68d9d3d9b6 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -27,7 +27,7 @@ - type: ShowHealthIcons - type: entity - parent: ClothingEyesHudBase + parent: [BaseCorvaxContraband431DepartmentsScience, ClothingEyesHudBase] # Corvax-Contraband id: ClothingEyesHudDiagnostic name: diagnostic hud description: A heads-up display capable of analyzing the integrity and status of robotics and exosuits. Made out of see-borg-ium. @@ -43,7 +43,7 @@ - type: ShowAccessReaderSettings - type: entity - parent: [ClothingEyesHudBase, ShowMedicalIcons] + parent: [BaseCorvaxContraband431DepartmentsMedical, ClothingEyesHudBase, ShowMedicalIcons] # Corvax-Contraband id: ClothingEyesHudMedical name: medical hud description: A heads-up display that scans the humanoids in view and provides accurate data about their health status. @@ -59,7 +59,7 @@ - WhitelistChameleon - type: entity - parent: [ClothingEyesHudBase, ShowSecurityIcons, BaseSecurityContraband] + parent: [BaseCorvaxContraband433DepartmentsCommandSecurity, ClothingEyesHudBase, ShowSecurityIcons, BaseSecurityContraband] # Corvax-Contraband id: ClothingEyesHudSecurity name: security hud description: A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records. @@ -75,7 +75,7 @@ - WhitelistChameleon - type: entity - parent: [ClothingEyesHudBase, BaseCommandContraband] + parent: [BaseCorvaxContraband433DepartmentsCommandSecurity, ClothingEyesHudBase, BaseCommandContraband] # Corvax-Contraband id: ClothingEyesHudCommand name: administration hud description: A heads-up display that scans the humanoids in view and provides accurate data about their ID status. @@ -91,7 +91,7 @@ - WhitelistChameleon - type: entity - parent: ClothingEyesHudBase + parent: [BaseCorvaxContraband431JobsBartender, ClothingEyesHudBase] # Corvax-Contraband id: ClothingEyesHudBeer name: beer goggles description: A pair of sunHud outfitted with apparatus to scan reagents, as well as providing an innate understanding of liquid viscosity while in motion. diff --git a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml index c6997ad5bf..2e68c1825b 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml @@ -319,7 +319,7 @@ # Insulated Gloves (Yellow Gloves) # Currently can not be greyscaled without looking like shit. - type: entity - parent: [ClothingHandsBase, BaseSlicingRefinable] + parent: [BaseCorvaxContraband431DepartmentsEngineering, ClothingHandsBase, BaseSlicingRefinable] # Corvax-Contraband id: ClothingHandsGlovesColorYellow name: insulated gloves description: These gloves will protect the wearer from electric shocks. diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index 5769c65733..720625f579 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -496,7 +496,7 @@ #Knuckledusters - type: entity - parent: [ClothingHandsBase, BaseMinorContraband] + parent: [BaseCorvaxContraband433DepartmentsSecurity, ClothingHandsBase, BaseMinorContraband] # Corvax-Contraband id: ClothingHandsKnuckleDusters name: knuckle dusters description: "Cold plasteel knuckle dusters, makes your punches hit much harder." @@ -571,7 +571,7 @@ stealGroup: ClothingHandsKnuckleDustersQM - type: entity - parent: [ClothingHandsBase, BaseSyndicateContraband] + parent: [BaseCorvaxContraband433DepartmentsSecurity, ClothingHandsBase, BaseSyndicateContraband] # Corvax-Contraband id: ClothingHandsKnuckleDustersSyndicate name: syndicate knuckle dusters description: "Plastitanium knuckle dusters branded with the blood-red S. A real man beats someone to death with these." diff --git a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml index dbac1633e6..21df0cfeb0 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml @@ -34,7 +34,7 @@ #Syndicate EVA Helmet - type: entity - parent: [ ClothingHeadEVAHelmetBase, BaseSyndicateContraband ] + parent: [ ClothingHeadEVAHelmetBase ] # Corvax-Contraband deleted - BaseSyndicateContraband id: ClothingHeadHelmetSyndicate name: syndicate EVA helmet description: A simple, stylish EVA helmet. Designed for maximum humble space-badassery. diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index c54bcf3693..3ad37fe77f 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -49,7 +49,7 @@ - WhitelistChameleon - type: entity - parent: ClothingHeadBase + parent: [BaseCorvaxContraband431JobsSecurityOfficerSeniorOfficer, ClothingHeadBase] # Corvax-Contraband id: ClothingHeadHatBeretSecurity name: security beret description: A beret with the security department's insignia. For officers that are more inclined towards style than safety. @@ -68,7 +68,7 @@ - WhitelistChameleon - type: entity - parent: ClothingHeadBase + parent: [BaseCorvaxContraband431JobsSecurityOfficer, ClothingHeadBase] # Corvax-Contraband id: ClothingHeadHatSecurityTrooper name: trooper hat description: A campaign hat for the Nanotrasen Troopers. It's supposed to come with a case, too... @@ -122,6 +122,12 @@ name: engineering beret description: A beret with the engineering department's insignia. For engineers that are more inclined towards style than safety. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [ChiefEngineer, SeniorEngineer, StationEngineer] + # Corvax-Contraband-end - type: Sprite sprite: Clothing/Head/Hats/beret_engineering.rsi - type: Clothing @@ -136,7 +142,7 @@ - WhitelistChameleon - type: entity - parent: ClothingHeadBase + parent: [BaseCorvaxContraband431JobsQuartermaster, ClothingHeadBase] # Corvax-Contraband id: ClothingHeadHatBeretQM name: quartermaster's beret description: A beret with the cargo department's insignia. @@ -155,7 +161,7 @@ - WhitelistChameleon - type: entity - parent: ClothingHeadBase + parent: [BaseCorvaxContraband431JobsHeadOfSecurity, ClothingHeadBase] # Corvax-Contraband id: ClothingHeadHatBeretHoS name: head of security's beret description: A black beret with a commander's rank emblem. For officers that are more inclined towards style than safety. @@ -174,7 +180,7 @@ - WhitelistChameleon - type: entity - parent: ClothingHeadBase + parent: [BaseCorvaxContraband431JobsWarden, ClothingHeadBase] # Corvax-Contraband id: ClothingHeadHatBeretWarden name: warden's beret description: A corporate-blue beret with a warden's rank emblem. For officers that are more inclined towards style than safety. @@ -206,7 +212,7 @@ - WhitelistChameleon - type: entity - parent: ClothingHeadBase + parent: [BaseCorvaxContraband431JobsBrigmedic, ClothingHeadBase] # Corvax-Contraband id: ClothingHeadHatBeretBrigmedic name: brigmedical beret description: A white beret for brigmedics. @@ -270,7 +276,7 @@ - WhitelistChameleon - type: entity - parent: [ClothingHeadBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsCaptain, ClothingHeadBase, BaseCommandContraband] # Corvax-Contraband id: ClothingHeadHatCaptain name: captain's hardhat description: Feels good being the king. @@ -304,7 +310,7 @@ - type: IngestionBlocker - type: entity - parent: [ ClothingHeadBase, BaseCentcommContraband ] + parent: [BaseCorvaxContraband431DepartmentsCentralCommandJobsCentralCommandOfficial, ClothingHeadBase, BaseCentcommContraband] # Corvax-Contraband id: ClothingHeadHatCentcom name: CentComm brand hat description: Feels good being the king's boss. @@ -320,7 +326,7 @@ - WhitelistChameleon - type: entity - parent: ClothingHeadBase + parent: [BaseCorvaxContraband431JobsChef, ClothingHeadBase] # Corvax-Contraband id: ClothingHeadHatChef name: chef's hat description: A hat used by chefs to keep their hair out of your food. Judging by the food in the mess, they don't work. @@ -428,7 +434,7 @@ - WhitelistChameleon - type: entity - parent: [ClothingHeadBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsHeadOfSecurity, ClothingHeadBase, BaseCommandContraband] # Corvax-Contraband id: ClothingHeadHatHoshat name: head of security cap description: A stylish cap worn by the Head of Security. Shows the officers who's in charge. @@ -512,7 +518,7 @@ relayAccent: true - type: entity - parent: ClothingHeadBase + parent: [ClothingHeadBase] id: ClothingHeadHatPlaguedoctor name: plague doctor hat description: These were once used by plague doctors. @@ -751,7 +757,7 @@ - WhitelistChameleon - type: entity - parent: ClothingHeadBase + parent: [BaseCorvaxContraband431JobsWarden, ClothingHeadBase] # Corvax-Contraband id: ClothingHeadHatWarden name: warden's cap description: This hat emphasizes that you are THE LAW. @@ -1027,7 +1033,7 @@ HeadSide : HEAD - type: entity - parent: [ClothingHeadBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefMedicalOfficer, ClothingHeadBase, BaseCommandContraband] # Corvax-Contraband id: ClothingHeadHatBeretCmo name: chief medical officer's beret description: A turquoise beret with a cross on the front. The sight of it calms you down and makes it clear that you will be cured. @@ -1474,7 +1480,7 @@ acts: [ "Destruction" ] - type: entity - parent: ClothingHeadBase + parent: [BaseCorvaxContraband431JobsMedicalDoctor, ClothingHeadBase] # Corvax-Contraband id: ClothingHeadHatBeretMedic name: medical beret description: A sterile white beret. diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index a458581493..c9d00759b2 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -29,7 +29,7 @@ #Security Helmet - type: entity - parent: [ClothingHeadHelmetArmoredBase, BaseFoldable, BaseSecurityContraband] + parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingHeadHelmetArmoredBase, BaseFoldable, BaseSecurityContraband] # Corvax-Contraband id: ClothingHeadHelmetBasic name: security helmet description: Standard security gear. Protects the head from impacts, and comes with a visor which can be lowered to protect the eyes. @@ -61,7 +61,7 @@ #Mercenary Helmet - type: entity - parent: [ ClothingHeadHelmetArmoredBase, BaseMajorContraband ] + parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingHeadHelmetArmoredBase, BaseMajorContraband] # Corvax-Contraband id: ClothingHeadHelmetMerc name: mercenary helmet description: The combat helmet is commonly used by mercenaries, is strong, light and smells like gunpowder and the jungle. @@ -76,7 +76,7 @@ #SWAT Helmet - type: entity - parent: [ClothingHeadHelmetBase, BaseSecurityContraband] + parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingHeadHelmetBase, BaseSecurityContraband] # Corvax-Contraband id: ClothingHeadHelmetSwat name: SWAT helmet description: An extremely robust helmet, commonly used by paramilitary forces. This one has the Nanotrasen logo emblazoned on the top. @@ -118,7 +118,7 @@ #Light Riot Helmet - type: entity - parent: [ClothingHeadHelmetBase, BaseFoldable, BaseSecurityContraband] + parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingHeadHelmetBase, BaseFoldable, BaseSecurityContraband] # Corvax-Contraband id: ClothingHeadHelmetRiot name: light riot helmet description: It's a helmet specifically designed to protect against close range attacks, it has a foldable visor. @@ -198,7 +198,7 @@ #Cult Helmet - type: entity - parent: [ClothingHeadHelmetBase, BaseMajorContraband] + parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingHeadHelmetBase, BaseMajorContraband] # Corvax-Contraband id: ClothingHeadHelmetCult name: cult helmet description: A robust, evil-looking cult helmet. @@ -379,7 +379,7 @@ #Chitinous Helmet - type: entity - parent: [ ClothingHeadHelmetBase, BaseMajorContraband] + parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingHeadHelmetBase, BaseMajorContraband] # Corvax-Contraband id: ClothingHeadHelmetLing name: chitinous helmet description: An all-consuming chitinous mass of armor. @@ -402,7 +402,7 @@ #ERT HELMETS #ERT Leader Helmet - type: entity - parent: [ BaseCentcommContraband, ClothingHeadHelmetArmoredBase ] + parent: [BaseCorvaxContraband432DepartmentsCentralCommand, BaseCentcommContraband, ClothingHeadHelmetArmoredBase] # Corvax-Contraband id: ClothingHeadHelmetERTLeader name: ERT leader helmet description: An in-atmosphere helmet worn by the leader of a Nanotrasen Emergency Response Team. Has blue highlights. @@ -476,7 +476,7 @@ Hair: HEAD - type: entity - parent: [ BaseSyndicateContraband, ClothingHeadHelmetBase ] + parent: [BaseCorvaxContraband432DepartmentsSecurity, BaseSyndicateContraband, ClothingHeadHelmetBase] # Corvax-Contraband id: ClothingHeadHelmetRaid name: syndicate raid helmet description: An armored helmet for use with the syndicate raid suit. Very stylish. @@ -499,7 +499,7 @@ #Bone Helmet #No need to hide the hair on this one - type: entity - parent: [ ClothingHeadHelmetArmoredBase, BaseMinorContraband ] + parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingHeadHelmetArmoredBase, BaseMinorContraband] # Corvax-Contraband id: ClothingHeadHelmetBone name: bone helmet description: Cool-looking helmet made of skull of your enemies. @@ -514,7 +514,7 @@ #Ironclad II Helmet - type: entity - parent: [ ClothingHeadHelmetArmoredBase, BaseMinorContraband ] + parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingHeadHelmetArmoredBase, BaseMinorContraband] # Corvax-Contraband id: ClothingHeadHelmetPodWars name: ironclad II helmet description: An ironclad II helmet, a relic of the pod wars. @@ -529,7 +529,7 @@ #Justice Helmet - type: entity - parent: [ClothingHeadHelmetArmoredBase, BaseSecurityContraband] + parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingHeadHelmetArmoredBase, BaseSecurityContraband] # Corvax-Contraband id: ClothingHeadHelmetJustice name: justice helm description: Advanced security gear. Protects the station from ne'er-do-wells. diff --git a/Resources/Prototypes/Entities/Clothing/Head/scraphelmet.yml b/Resources/Prototypes/Entities/Clothing/Head/scraphelmet.yml index 25669d5d00..dc55de0081 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/scraphelmet.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/scraphelmet.yml @@ -51,7 +51,7 @@ # The helmet itself - type: entity - parent: [ClothingHeadHelmetBase, BaseMajorContraband] + parent: [BaseCorvaxContraband432DepartmentsCargoSecurity, ClothingHeadHelmetBase, BaseMajorContraband] # Corvax-Contraband id: ClothingHeadHelmetScrap #When we get the tech for it this bad boy needs to be given a vision reduction when equipped. 1-2 tiles less than normal should be good. name: scrap helmet description: A cobbled-together helmet made from cabling, steel, and a bucket. diff --git a/Resources/Prototypes/Entities/Clothing/Head/soft.yml b/Resources/Prototypes/Entities/Clothing/Head/soft.yml index a5b0b7abaf..86f301744c 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml @@ -56,7 +56,7 @@ name: blue cap - type: entity - parent: ClothingHeadHeadHatBaseFlippable + parent: [BaseCorvaxContraband431JobsCargoTechnician, ClothingHeadHeadHatBaseFlippable] # Corvax-Contraband id: ClothingHeadHatCargosoft name: cargo cap description: A baseball cap colored to match cargo's uniforms. @@ -85,7 +85,7 @@ - WhitelistChameleon - type: entity - parent: ClothingHeadHeadHatBaseFlippable + parent: [BaseCorvaxContraband431JobsQuartermaster, ClothingHeadHeadHatBaseFlippable] # Corvax-Contraband id: ClothingHeadHatQMsoft name: quartermaster's cap description: A baseball cap colored to match the Quartermaster's uniform. @@ -258,7 +258,7 @@ name: red cap - type: entity - parent: ClothingHeadHeadHatBaseFlippable + parent: [BaseCorvaxContraband431JobsSecurityOfficerSeniorOfficer, ClothingHeadHeadHatBaseFlippable] # Corvax-Contraband id: ClothingHeadHatSecsoft name: security cap description: A baseball cap colored to match security's uniforms. @@ -306,7 +306,7 @@ name: troublemaker's cap - type: entity - parent: ClothingHeadHeadHatBaseFlippable + parent: [BaseCorvaxContraband431JobsParamedic, ClothingHeadHeadHatBaseFlippable] # Corvax-Contraband id: ClothingHeadHatParamedicsoft name: paramedic cap description: A blue baseball cap with a cross on the front. diff --git a/Resources/Prototypes/Entities/Clothing/Head/welding.yml b/Resources/Prototypes/Entities/Clothing/Head/welding.yml index c0ae440a56..595b87ef74 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/welding.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/welding.yml @@ -25,7 +25,7 @@ - Snout - type: entity - parent: WeldingMaskBase + parent: [BaseCorvaxContraband431DepartmentsEngineering, WeldingMaskBase] # Corvax-Contraband id: ClothingHeadHatWelding name: welding mask description: A head-mounted face cover designed to protect the wearer completely from space-arc eye. diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index b673ee9c2b..cafbbe1794 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -21,7 +21,7 @@ hideOnToggle: true - type: entity - parent: [ClothingMaskGas, BaseSecurityContraband] + parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingMaskGas, BaseSecurityContraband] # Corvax-Contraband id: ClothingMaskGasSecurity name: security gas mask description: A standard issue Security gas mask. @@ -41,7 +41,7 @@ Heat: 0.95 - type: entity - parent: [ClothingMaskGas, BaseSyndicateContraband] + parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingMaskGas, BaseSyndicateContraband] # Corvax-Contraband id: ClothingMaskGasSyndicate name: syndicate gas mask description: A close-fitting tactical mask that can be connected to an air supply. @@ -398,7 +398,7 @@ relayAccent: true - type: entity - parent: [ ClothingMaskGas, BaseSecurityContraband ] + parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingMaskGas, BaseSecurityContraband] # Corvax-Contraband id: ClothingMaskGasSwat name: swat gas mask description: A elite issue Security gas mask. diff --git a/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml b/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml index c80fd341cc..63e9c94ad0 100644 --- a/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml +++ b/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml @@ -134,7 +134,7 @@ - type: entity id: TowelColorSyndicate name: syndicate towel - parent: [ BaseTowel, BaseSyndicateContraband ] + parent: [BaseCorvaxContraband131, BaseTowel, BaseSyndicateContraband] # Corvax-Contraband components: - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index c5e4cca8ce..3fd8e27a1e 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -1,5 +1,5 @@ - type: entity - parent: ClothingNeckBase + parent: [BaseCorvaxContraband431DepartmentsCentralCommand, ClothingNeckBase] # Corvax-Contraband id: ClothingNeckCloakCentcom name: central commander's cloak description: A pompous and elite green cloak with a nice gold trim, tailored specifically to the Central Commander. It's so heavy, the gold trim might be real. @@ -10,7 +10,7 @@ stealGroup: HeadCloak # leaving this here because I suppose it might be interesting? - type: entity - parent: [ClothingNeckBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsCaptain, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband id: ClothingNeckCloakCap name: captain's cloak description: A pompous and comfy blue cloak with a nice gold trim, while not particularly valuable as your other possessions, it sure is fancy. @@ -21,7 +21,7 @@ stealGroup: HeadCloak - type: entity - parent: [ClothingNeckBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsHeadOfSecurity, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband id: ClothingNeckCloakHos name: head of security's cloak description: An exquisite dark and red cloak fitting for those who can assert dominance over wrongdoers. Take a stab at being civil in prosecution! @@ -32,7 +32,7 @@ stealGroup: HeadCloak - type: entity - parent: [ClothingNeckBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefEngineer, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband id: ClothingNeckCloakCe name: chief engineer's cloak description: A dark green cloak with light blue ornaments, given to those who proved themselves to master the precise art of engineering. @@ -43,7 +43,7 @@ stealGroup: HeadCloak - type: entity - parent: [ClothingNeckBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefMedicalOfficer, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband id: ClothingCloakCmo name: chief medical officer's cloak description: A sterile blue cloak with a green cross, radiating with a sense of duty and willingness to help others. @@ -54,7 +54,7 @@ stealGroup: HeadCloak - type: entity - parent: [ClothingNeckBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsResearchDirector, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband id: ClothingNeckCloakRd name: research director's cloak description: A white cloak with violet stripes, showing your status as the arbiter of cutting-edge technology. @@ -65,7 +65,7 @@ stealGroup: HeadCloak - type: entity - parent: [ClothingNeckBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsQuartermaster, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband id: ClothingNeckCloakQm name: quartermaster's cloak description: A strong brown cloak with a reflective stripe, while not as fancy as others, it does show your managing skills. @@ -76,7 +76,7 @@ stealGroup: HeadCloak - type: entity - parent: [ClothingNeckBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsHeadOfPersonnel, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband id: ClothingNeckCloakHop name: head of personnel's cloak description: A blue cloak with red shoulders and gold buttons, proving you are the gatekeeper to any airlock on the station. @@ -105,7 +105,7 @@ sprite: Clothing/Neck/Cloaks/nanotrasen.rsi - type: entity - parent: [ClothingNeckBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsCaptain, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband id: ClothingNeckCloakCapFormal name: captain's formal cloak description: A lavish and decorated cloak for special occasions. diff --git a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml index 21f9a2ba7a..7f6e49d0f9 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml @@ -1,5 +1,5 @@ - type: entity - parent: [ClothingNeckBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsCaptain, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband id: ClothingNeckMantleCap name: captain's mantle description: A formal mantle to drape around the shoulders. Others stand on the shoulders of giants. You're the giant they stand on. # Corvax-Resprite @@ -10,7 +10,7 @@ sprite: Clothing/Neck/mantles/capmantle.rsi - type: entity - parent: [ClothingNeckBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefEngineer, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband id: ClothingNeckMantleCE name: chief engineer's mantle description: A bright white and yellow striped mantle. Do not wear around active machinery. # Corvax-Resprite @@ -21,7 +21,7 @@ sprite: Clothing/Neck/mantles/cemantle.rsi - type: entity - parent: [ClothingNeckBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefMedicalOfficer, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband id: ClothingNeckMantleCMO name: chief medical officer's mantle description: A light blue shoulder draping for THE medical professional. Contrasts well with blood. # Corvax-Resprite @@ -43,7 +43,7 @@ sprite: Clothing/Neck/mantles/hopmantle.rsi - type: entity - parent: [ClothingNeckBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsHeadOfSecurity, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband id: ClothingNeckMantleHOS name: head of security's mantle description: Shootouts with syndicate agents are just another Tuesday for this HoS. This mantle is a symbol of commitment to the station. @@ -54,7 +54,7 @@ sprite: Clothing/Neck/mantles/hosmantle.rsi - type: entity - parent: [ClothingNeckBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsResearchDirector, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband id: ClothingNeckMantleRD name: research director's mantle description: A terribly comfortable shoulder draping for the discerning scientist of fashion. # Corvax-Resprite @@ -65,7 +65,7 @@ sprite: Clothing/Neck/mantles/rdmantle.rsi - type: entity - parent: [ClothingNeckBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsQuartermaster, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband id: ClothingNeckMantleQM name: quartermaster's mantle description: For the master of goods and materials to rule over the department, a befitting mantle to show off superiority! diff --git a/Resources/Prototypes/Entities/Clothing/Neck/stoles.yml b/Resources/Prototypes/Entities/Clothing/Neck/stoles.yml index d708a48f7d..5c52a09047 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/stoles.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/stoles.yml @@ -4,6 +4,12 @@ name: chaplain stole description: An elegantly designed stole, with a vibrant gold plus on either end. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [Chaplain, ERTChaplain] + # Corvax-Contraband-end - type: Sprite sprite: Clothing/Neck/Stoles/chaplain.rsi - type: Clothing diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 183ffc259f..f72b8c82c7 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -26,7 +26,7 @@ #Standard armor vest, allowed for security only - type: entity - parent: [ BaseSecurityContraband, ClothingOuterArmorBase ] + parent: [BaseCorvaxContraband432DepartmentsSecurity, BaseSecurityContraband, ClothingOuterArmorBase] # Corvax-Contraband id: ClothingOuterArmorBasic components: - type: Tag @@ -41,6 +41,12 @@ suffix: slim description: A slim Type I armored vest that provides decent protection against most types of damage. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax432 + allowedDepartments: [Security] + allowedJobs: [Bartender] + # Corvax-Contraband-end - type: Sprite sprite: Clothing/OuterClothing/Armor/security_slim.rsi - type: Clothing @@ -122,6 +128,12 @@ name: captain's carapace description: An armored chestpiece that provides protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax432 + allowedDepartments: [Command] + allowedJobs: [] + # Corvax-Contraband-end - type: Sprite sprite: Clothing/OuterClothing/Armor/captain_carapace.rsi - type: Clothing @@ -131,7 +143,7 @@ - WhitelistChameleon - type: entity - parent: [ClothingOuterArmorBaseCarapace, BaseCentcommContraband] + parent: [BaseCorvaxContraband432DepartmentsCentralCommand, ClothingOuterArmorBaseCarapace, BaseCentcommContraband] # Corvax-Contraband id: ClothingOuterArmorCentcommCarapace name: centcomm carapace description: An armored chestpiece that provides protection whilst still offering maximum mobility and flexibility. Issued only to centcomm officials and agents. @@ -143,7 +155,7 @@ #Web vest - type: entity - parent: [ClothingOuterArmorBase, ClothingOuterStorageBase, BaseSyndicateContraband] + parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingOuterArmorBase, ClothingOuterStorageBase, BaseSyndicateContraband] # Corvax-Contraband id: ClothingOuterVestWeb name: web vest description: A synthetic armor vest. This one has added webbing and ballistic plates. @@ -164,7 +176,7 @@ #Elite web vest - type: entity - parent: [ClothingOuterArmorBase, TemperatureProtection, ClothingOuterStorageBase, BaseSyndicateContraband] + parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingOuterArmorBase, TemperatureProtection, ClothingOuterStorageBase, BaseSyndicateContraband] # Corvax-Contraband id: ClothingOuterVestWebElite name: elite web vest description: A synthetic armor vest. This one has added webbing and heat resistant fibers. @@ -189,7 +201,7 @@ #Mercenary web vest - type: entity - parent: [ BaseMajorContraband, ClothingOuterVestWeb] #web vest so it should have some pockets for ammo + parent: [BaseCorvaxContraband432DepartmentsSecurity, BaseMajorContraband, ClothingOuterVestWeb] # Corvax-Contraband; web vest so it should have some pockets for ammo id: ClothingOuterVestWebMerc name: mercenary web vest description: A high-quality armored vest made from a hard synthetic material. It's surprisingly flexible and light, despite formidable armor plating. @@ -209,7 +221,7 @@ # Armor covering multiple body parts including limbs - type: entity - parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseSyndicateContraband ] + parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseSyndicateContraband] # Corvax-Contraband id: ClothingOuterArmorRaid name: syndicate raid suit description: A somewhat flexible and well-armored suit with a powerful shoulder mounted flashlight manufactured in the Gorlex Marauder's iconic blood-red color scheme, it does not protect its wearer from space. @@ -283,7 +295,7 @@ size: Normal - type: entity - parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseSecurityContraband] + parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseSecurityContraband] # Corvax-Contraband id: ClothingOuterArmorRiot name: riot suit description: A suit of semi-flexible polycarbonate body armor with heavy padding to protect against melee attacks. Perfect for fighting delinquents around the station. @@ -305,7 +317,7 @@ - type: GroupExamine - type: entity - parent: [ ClothingOuterBaseLarge, BaseMajorContraband, AllowSuitStorageClothing ] + parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingOuterBaseLarge, BaseMajorContraband, AllowSuitStorageClothing] # Corvax-Contraband id: ClothingOuterArmorCult name: acolyte armor description: An evil-looking piece of cult armor, made of bones. @@ -391,7 +403,7 @@ sprite: Clothing/OuterClothing/Armor/magusred.rsi - type: entity - parent: [ ClothingOuterBaseLarge, BaseMajorContraband, AllowSuitStorageClothing ] + parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingOuterBaseLarge, BaseMajorContraband, AllowSuitStorageClothing] # Corvax-Contraband id: ClothingOuterArmorChangeling name: chitinous armor description: Inflates the changeling's body into an all-consuming chitinous mass of armor. @@ -419,7 +431,7 @@ slots: WITHOUT_POCKET - type: entity - parent: [ ClothingOuterBaseLarge, BaseMajorContraband, AllowSuitStorageClothing ] + parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingOuterBaseLarge, BaseMajorContraband, AllowSuitStorageClothing] # Corvax-Contraband id: ClothingOuterArmorBone name: bone armor description: Sits on you like a second skin. @@ -448,7 +460,7 @@ slots: WITHOUT_POCKET - type: entity - parent: [ ClothingOuterBaseLarge, BaseMajorContraband, AllowSuitStorageClothing ] + parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingOuterBaseLarge, BaseMajorContraband, AllowSuitStorageClothing] # Corvax-Contraband id: ClothingOuterArmorPodWars name: ironclad II armor description: A repurposed suit of ironclad II armor, a relic of the pod wars. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index bc3d02385c..f6b51c542b 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -39,7 +39,7 @@ - type: entity - parent: ClothingOuterCoatDetective + parent: [BaseCorvaxContraband431DepartmentsSecurityJobsDetective, ClothingOuterCoatDetective] # Corvax-Contraband id: ClothingOuterCoatDetectiveLoadout components: - type: EntityTableContainerFill @@ -89,7 +89,7 @@ Caustic: 0.9 - type: entity - parent: [BaseSecurityCommandContraband, ClothingOuterArmorHoS] + parent: [BaseCorvaxContraband431DepartmentsCommandSecurityJobsHeadOfSecurity, BaseSecurityCommandContraband, ClothingOuterArmorHoS] # Corvax-Contraband id: ClothingOuterCoatHoSTrench name: head of security's armored trenchcoat description: A greatcoat enhanced with a special alloy for some extra protection and style for those with a commanding presence. @@ -158,7 +158,7 @@ name: lab coat - type: entity - parent: ClothingOuterStorageFoldableBase + parent: [BaseCorvaxContraband431JobsChemist, ClothingOuterStorageFoldableBase] # Corvax-Contraband id: ClothingOuterCoatLabChem name: chemist lab coat description: A suit that protects against minor chemical spills. Has an orange stripe on the shoulder. @@ -218,7 +218,7 @@ name: geneticist lab coat - type: entity - parent: ClothingOuterStorageFoldableBase + parent: [BaseCorvaxContraband431JobsChiefMedicalOfficer, ClothingOuterStorageFoldableBase] # Corvax-Contraband id: ClothingOuterCoatLabCmo name: chief medical officer's lab coat description: Custom made blue lab coat for the Chief Medical Officer, offers improved protection against chemical spills and minor cuts. @@ -240,7 +240,7 @@ name: chief medical officer's lab coat - type: entity - parent: ClothingOuterStorageFoldableBase + parent: [BaseCorvaxContraband431JobsScientist, ClothingOuterStorageFoldableBase] # Corvax-Contraband id: ClothingOuterCoatRnd name: scientist lab coat description: A suit that protects against minor chemical spills. Has a purple stripe on the shoulder. @@ -280,7 +280,7 @@ name: roboticist lab coat - type: entity - parent: ClothingOuterStorageFoldableBase + parent: [BaseCorvaxContraband431JobsResearchDirector, ClothingOuterStorageFoldableBase] # Corvax-Contraband id: ClothingOuterCoatRD name: research director lab coat description: Woven with top of the line technology, this labcoat helps protect against radiation in similar way to the experimental hardsuit. @@ -312,7 +312,7 @@ sprite: Clothing/OuterClothing/Coats/pirate.rsi - type: entity - parent: [ClothingOuterArmorWarden, BaseSecurityContraband] + parent: [BaseCorvaxContraband431DepartmentsSecurityJobsWarden, ClothingOuterArmorWarden, BaseSecurityContraband] # Corvax-Contraband id: ClothingOuterCoatWarden name: warden's armored jacket description: A sturdy, utilitarian jacket designed to protect a warden from any brig-bound threats. @@ -362,7 +362,7 @@ Piercing: 0.85 - type: entity - parent: ClothingOuterStorageBase + parent: [BaseCorvaxContraband431JobsParamedic, ClothingOuterStorageBase] # Corvax-Contraband id: ClothingOuterCoatParamedicWB name: paramedic windbreaker description: A paramedic's trusty windbreaker, for all the space wind. @@ -384,7 +384,7 @@ sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi - type: entity - parent: [BaseSyndicateContraband, ClothingOuterCoatHoSTrench] # BaseSyndicateContraband as first parent so contraband system takes that as priority, yeah I know + parent: [BaseCorvaxContraband432DepartmentsSecurity, BaseSyndicateContraband, ClothingOuterCoatHoSTrench] # Corvax-Contraband; BaseSyndicateContraband as first parent so contraband system takes that as priority, yeah I know id: ClothingOuterCoatSyndieCapArmored name: syndicate's armored coat description: The syndicate's armored coat is made of durable fabric, with gilded patterns. @@ -395,7 +395,7 @@ sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi - type: entity - parent: ClothingOuterStorageBase + parent: [BaseCorvaxContraband431JobsBrigmedic, ClothingOuterStorageBase] # Corvax-Contraband id: ClothingOuterCoatAMG name: armored medical gown description: The version of the medical gown, with elements of a bulletproof vest, looks strange, but your heart is protected. @@ -414,7 +414,7 @@ Caustic: 0.75 - type: entity - parent: ClothingOuterStorageFoldableBase + parent: [BaseCorvaxContraband431JobsScientistSeniorResearcher, ClothingOuterStorageFoldableBase] # Corvax-Contraband id: ClothingOuterCoatLabSeniorResearcher name: senior researcher lab coat description: A suit that protects against minor chemical spills. Has a purple collar and wrist trims. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index d4a305d46a..9ff206455d 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -110,7 +110,7 @@ #Salvage Hardsuit - type: entity - parent: [ClothingOuterHardsuitBase, BaseCargoContraband] + parent: [BaseCorvaxContraband432DepartmentsCargoSecurity, ClothingOuterHardsuitBase, BaseCargoContraband] # Corvax-Contraband id: ClothingOuterHardsuitSalvage name: mining hardsuit description: A special suit that protects against hazardous, low pressure environments. Has reinforced plating for wildlife encounters. @@ -146,7 +146,7 @@ #Goliath Hardsuit - type: entity - parent: [ClothingOuterHardsuitBase, BaseCargoContraband] + parent: [BaseCorvaxContraband432DepartmentsCargoSecurity, ClothingOuterHardsuitBase, BaseCargoContraband] # Corvax-Contraband id: ClothingOuterHardsuitGoliath name: goliath hardsuit description: A lightweight hardsuit, adorned with a patchwork of thick, chitinous goliath hide. @@ -215,7 +215,7 @@ #Security Hardsuit - type: entity - parent: [ClothingOuterHardsuitBase, BaseSecurityContraband] + parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingOuterHardsuitBase, BaseSecurityContraband] # Corvax-Contraband id: ClothingOuterHardsuitSecurity name: security hardsuit description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. @@ -250,7 +250,7 @@ #Brigmedic Hardsuit - type: entity - parent: [ClothingOuterHardsuitBase, BaseSecurityContraband] + parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingOuterHardsuitBase, BaseSecurityContraband] # Corvax-Contraband id: ClothingOuterHardsuitBrigmedic name: brigmedic hardsuit description: Special hardsuit of the guardian angel of the brig. It is the medical version of the security hardsuit. @@ -277,7 +277,7 @@ #Warden's Hardsuit - type: entity - parent: [ClothingOuterHardsuitBase, BaseSecurityContraband] + parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingOuterHardsuitBase, BaseSecurityContraband] # Corvax-Contraband id: ClothingOuterHardsuitWarden name: warden's hardsuit description: A specialized riot suit geared to combat low pressure environments. @@ -458,7 +458,7 @@ #Head of Security's Hardsuit - type: entity - parent: [ClothingOuterHardsuitBase, BaseCommandContraband] + parent: [BaseCorvaxContraband432DepartmentsCommandSecurity, ClothingOuterHardsuitBase, BaseCommandContraband] # Corvax-Contraband id: ClothingOuterHardsuitSecurityRed name: head of security's hardsuit description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. @@ -847,7 +847,7 @@ #CENTCOMM / ERT HARDSUITS #ERT Leader Hardsuit - type: entity - parent: [ BaseCentcommContraband, ClothingOuterHardsuitSyndieCommander ] + parent: [BaseCorvaxContraband432DepartmentsCentralCommand, BaseCentcommContraband, ClothingOuterHardsuitSyndieCommander] # Corvax-Contraband id: ClothingOuterHardsuitERTLeader name: ERT leader's hardsuit description: A protective hardsuit worn by the leader of an emergency response team. @@ -865,7 +865,7 @@ #ERT Chaplain Hardsuit - type: entity - parent: [ BaseCentcommContraband, ClothingOuterHardsuitSyndie ] + parent: [BaseCorvaxContraband432DepartmentsCentralCommand, BaseCentcommContraband, ClothingOuterHardsuitSyndie] # Corvax-Contraband id: ClothingOuterHardsuitERTChaplain name: ERT chaplain's hardsuit description: A protective hardsuit worn by the chaplains of an Emergency Response Team. @@ -883,7 +883,7 @@ #ERT Engineer Hardsuit - type: entity - parent: [ BaseCentcommContraband, ClothingOuterHardsuitSyndieElite ] + parent: [BaseCorvaxContraband432DepartmentsCentralCommand, BaseCentcommContraband, ClothingOuterHardsuitSyndieElite] # Corvax-Contraband id: ClothingOuterHardsuitERTEngineer name: ERT engineer's hardsuit description: A protective hardsuit worn by the engineers of an emergency response team. @@ -903,7 +903,7 @@ #ERT Medic Hardsuit - type: entity - parent: [ BaseCentcommContraband, ClothingOuterHardsuitSyndieMedic ] + parent: [BaseCorvaxContraband432DepartmentsCentralCommand, BaseCentcommContraband, ClothingOuterHardsuitSyndieMedic] # Corvax-Contraband id: ClothingOuterHardsuitERTMedical name: ERT medic's hardsuit description: A protective hardsuit worn by the medics of an emergency response team. @@ -921,7 +921,7 @@ #ERT Security Hardsuit - type: entity - parent: [ BaseCentcommContraband, ClothingOuterHardsuitSyndie ] + parent: [BaseCorvaxContraband432DepartmentsCentralCommand, BaseCentcommContraband, ClothingOuterHardsuitSyndie] # Corvax-Contraband id: ClothingOuterHardsuitERTSecurity name: ERT security's hardsuit description: A protective hardsuit worn by the security officers of an emergency response team. @@ -943,7 +943,7 @@ #ERT Janitor Hardsuit - type: entity - parent: [ BaseCentcommContraband, ClothingOuterHardsuitSyndieElite ] + parent: [BaseCorvaxContraband432DepartmentsCentralCommand, BaseCentcommContraband, ClothingOuterHardsuitSyndieElite] # Corvax-Contraband id: ClothingOuterHardsuitERTJanitor name: ERT janitor's hardsuit description: A protective hardsuit worn by the janitors of an emergency response team. @@ -961,7 +961,7 @@ #Deathsquad - type: entity - parent: [ BaseCentcommContraband, ClothingOuterHardsuitBase ] + parent: [BaseCorvaxContraband432DepartmentsCentralCommand, BaseCentcommContraband, ClothingOuterHardsuitBase] # Corvax-Contraband id: ClothingOuterHardsuitDeathsquad name: death squad hardsuit description: An advanced hardsuit favored by commandos for use in special operations. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml index 2612bc8507..494c91d997 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml @@ -30,7 +30,7 @@ - WhitelistChameleon - type: entity - parent: ClothingOuterStorageBase + parent: [BaseCorvaxContraband431JobsBotanist, ClothingOuterStorageBase] # Corvax-Contraband id: ClothingOuterApronBotanist name: apron suffix: Botanical @@ -46,7 +46,7 @@ - WhitelistChameleon - type: entity - parent: ClothingOuterStorageBase + parent: [BaseCorvaxContraband431JobsChef, ClothingOuterStorageBase] # Corvax-Contraband id: ClothingOuterApronChef name: apron suffix: Chef @@ -62,7 +62,7 @@ - WhitelistChameleon - type: entity - parent: ClothingOuterStorageBase + parent: [BaseCorvaxContraband431JobsChef, ClothingOuterStorageBase] # Corvax-Contraband id: ClothingOuterJacketChef name: chef jacket description: An apron-jacket used by a high class chef. @@ -111,7 +111,7 @@ - WhitelistChameleon - type: entity - parent: ClothingOuterBaseToggleable + parent: [BaseCorvaxContraband431JobsChaplain, ClothingOuterBaseToggleable] # Corvax-Contraband id: ClothingOuterHoodieChaplain name: chaplain's hoodie description: Black and strict chaplain hoodie. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/scraparmor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/scraparmor.yml index 19bddb963b..7fbad44035 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/scraparmor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/scraparmor.yml @@ -51,7 +51,7 @@ # The armor itself - type: entity - parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseMajorContraband] + parent: [BaseCorvaxContraband432DepartmentsCargoSecurity, ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseMajorContraband] # Corvax-Contraband id: ClothingOuterArmorScrap name: scrap armor description: A tider's gleaming plate mail. Bail up, or you're a dead man. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml index 06ee2405e4..c5f4634d76 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml @@ -17,7 +17,7 @@ #Syndicate EVA - type: entity - parent: [ ClothingOuterEVASuitBase, BaseSyndicateContraband ] + parent: [ ClothingOuterEVASuitBase ] # Corvax-Contraband deleted - BaseSyndicateContraband id: ClothingOuterEVASuitSyndicate name: syndicate EVA suit description: "Has a tag on the back that reads: 'Totally not property of an enemy corporation, honest!'" diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 88699d7e26..0a06ba3fa2 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -41,7 +41,7 @@ ents: [] - type: entity - parent: ClothingOuterWinterCoatToggleable + parent: [BaseCorvaxContraband431JobsAtmosphericTechnicianSeniorEngineer, ClothingOuterWinterCoatToggleable] # Corvax-Contraband id: ClothingOuterWinterAtmos name: atmospherics winter coat components: @@ -87,7 +87,7 @@ clothingPrototype: ClothingHeadHatHoodWinterBartender - type: entity - parent: [ClothingOuterWinterCoatToggleable, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsCaptain, ClothingOuterWinterCoatToggleable, BaseCommandContraband] # Corvax-Contraband id: ClothingOuterWinterCap name: captain's winter coat components: @@ -110,7 +110,7 @@ clothingPrototype: ClothingHeadHatHoodWinterCaptain - type: entity - parent: ClothingOuterWinterCoatToggleable + parent: [BaseCorvaxContraband431JobsCargoTechnician, ClothingOuterWinterCoatToggleable] # Corvax-Contraband id: ClothingOuterWinterCargo name: cargo winter coat components: @@ -133,7 +133,7 @@ clothingPrototype: ClothingHeadHatHoodWinterCargo - type: entity - parent: [ClothingOuterWinterCoatToggleable, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefEngineer, ClothingOuterWinterCoatToggleable, BaseCommandContraband] # Corvax-Contraband id: ClothingOuterWinterCE name: chief engineer's winter coat components: @@ -179,7 +179,7 @@ clothingPrototype: ClothingHeadHatHoodWinterCentcom - type: entity - parent: ClothingOuterWinterCoat + parent: [BaseCorvaxContraband431JobsChef, ClothingOuterWinterCoat] # Corvax-Contraband id: ClothingOuterWinterChef name: chef's freezer coat description: A coat specifically designed for work inside cold storage, sorely needed by cold-blooded lizard chefs. @@ -201,7 +201,7 @@ - state: CHEF-equipped-OUTERCLOTHING - type: entity - parent: ClothingOuterWinterCoatToggleable + parent: [BaseCorvaxContraband431JobsChemist, ClothingOuterWinterCoatToggleable] # Corvax-Contraband id: ClothingOuterWinterChem name: chemistry winter coat components: @@ -231,7 +231,7 @@ clothingPrototype: ClothingHeadHatHoodWinterChem - type: entity - parent: [ClothingOuterWinterCoatToggleable, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefMedicalOfficer, ClothingOuterWinterCoatToggleable, BaseCommandContraband] # Corvax-Contraband id: ClothingOuterWinterCMO name: chief medical officer's winter coat components: @@ -271,7 +271,7 @@ sprite: Clothing/OuterClothing/WinterCoats/coatclown.rsi - type: entity - parent: ClothingOuterWinterCoatToggleable + parent: [BaseCorvaxContraband431JobsSeniorEngineerStationEngineer, ClothingOuterWinterCoatToggleable] # Corvax-Contraband id: ClothingOuterWinterEngi name: engineering winter coat components: @@ -324,7 +324,7 @@ clothingPrototype: ClothingHeadHatHoodWinterSci - type: entity - parent: [ClothingOuterWinterCoatToggleable, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsHeadOfPersonnel, ClothingOuterWinterCoatToggleable, BaseCommandContraband] # Corvax-Contraband id: ClothingOuterWinterHoP name: head of personnel's winter coat components: @@ -349,7 +349,7 @@ ########################################################## - type: entity - parent: [ClothingOuterArmorHoS, ClothingOuterWinterCoatToggleable, BaseSecurityCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandSecurityJobsHeadOfSecurity, ClothingOuterArmorHoS, ClothingOuterWinterCoatToggleable, BaseSecurityCommandContraband] # Corvax-Contraband id: ClothingOuterWinterHoS name: head of security's armored winter coat description: A sturdy, utilitarian winter coat designed to protect a head of security from any brig-bound threats and hypothermic events. @@ -415,7 +415,7 @@ clothingPrototype: ClothingHeadHatHoodWinterHydro - type: entity - parent: ClothingOuterWinterCoatToggleable + parent: [BaseCorvaxContraband431JobsJanitor, ClothingOuterWinterCoatToggleable] # Corvax-Contraband id: ClothingOuterWinterJani name: janitorial winter coat components: @@ -445,7 +445,7 @@ clothingPrototype: ClothingHeadHatHoodWinterJani - type: entity - parent: ClothingOuterWinterCoatToggleable + parent: [BaseCorvaxContraband431JobsMedicalDoctor, ClothingOuterWinterCoatToggleable] # Corvax-Contraband id: ClothingOuterWinterMed name: medical winter coat components: @@ -521,7 +521,7 @@ clothingPrototype: ClothingHeadHatHoodWinterMiner - type: entity - parent: ClothingOuterWinterCoatToggleable + parent: [BaseCorvaxContraband431JobsParamedic, ClothingOuterWinterCoatToggleable] # Corvax-Contraband id: ClothingOuterWinterPara name: paramedic winter coat components: @@ -551,7 +551,7 @@ clothingPrototype: ClothingHeadHatHoodWinterPara - type: entity - parent: [ClothingOuterWinterCoatToggleable, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsQuartermaster, ClothingOuterWinterCoatToggleable, BaseCommandContraband] # Corvax-Contraband id: ClothingOuterWinterQM name: quartermaster's winter coat components: @@ -575,7 +575,7 @@ - type: entity - parent: [ClothingOuterWinterCoatToggleable, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsResearchDirector, ClothingOuterWinterCoatToggleable, BaseCommandContraband] # Corvax-Contraband id: ClothingOuterWinterRD name: research director's winter coat components: @@ -629,7 +629,7 @@ - type: entity - parent: ClothingOuterWinterCoatToggleable + parent: [BaseCorvaxContraband431JobsScientist, ClothingOuterWinterCoatToggleable] # Corvax-Contraband id: ClothingOuterWinterSci name: science winter coat components: @@ -659,7 +659,7 @@ clothingPrototype: ClothingHeadHatHoodWinterSci - type: entity - parent: [ClothingOuterWinterCoatToggleable, BaseSecurityContraband] + parent: [BaseCorvaxContraband431DepartmentsSecurityJobsBrigmedicDetectiveSecurityOfficerSeniorOfficer, ClothingOuterWinterCoatToggleable, BaseSecurityContraband] # Corvax-Contraband id: ClothingOuterWinterSec name: security winter coat components: @@ -713,7 +713,7 @@ ################################################################ - type: entity - parent: [ClothingOuterArmorWarden, ClothingOuterWinterCoatToggleable, BaseSecurityContraband] + parent: [BaseCorvaxContraband431DepartmentsSecurityJobsWarden, ClothingOuterArmorWarden, ClothingOuterWinterCoatToggleable, BaseSecurityContraband] # Corvax-Contraband id: ClothingOuterWinterWarden name: warden's armored winter coat description: A sturdy, utilitarian winter coat designed to protect a warden from any brig-bound threats and hypothermic events. @@ -781,7 +781,7 @@ ############################################################## - type: entity - parent: [ BaseSyndicateContraband, ClothingOuterWinterWarden ] + parent: [BaseCorvaxContraband432DepartmentsSecurity, BaseSyndicateContraband, ClothingOuterWinterWarden] # Corvax-Contraband 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/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml index 708cd59ce1..55d86208c6 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml @@ -40,7 +40,7 @@ - WhitelistChameleon - type: entity - parent: [ClothingShoesBootsMagBase] + parent: [BaseCorvaxContraband431DepartmentsEngineering, ClothingShoesBootsMagBase] # Corvax-Contraband id: ClothingShoesBootsMag - type: entity @@ -67,7 +67,7 @@ stealGroup: ClothingShoesBootsMagAdv - type: entity - parent: [ClothingShoesBootsMagBase] + parent: [BaseCorvaxContraband431DepartmentsScience, ClothingShoesBootsMagBase] # Corvax-Contraband id: ClothingShoesBootsMagSci components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/cargo.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/cargo.yml index d1f8c969bc..ea3d493004 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/cargo.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/cargo.yml @@ -1,5 +1,5 @@ - type: entity - parent: ClothingUniformSkirtBase + parent: [BaseCorvaxContraband431JobsCargoTechnician, ClothingUniformSkirtBase] # Corvax-Contraband id: ClothingUniformJumpskirtCargo name: cargo tech jumpskirt description: A sturdy jumpskirt, issued to members of the Cargo department. @@ -10,7 +10,7 @@ sprite: Clothing/Uniforms/Jumpskirts/Cargo/cargotech.rsi - type: entity - parent: [ClothingUniformSkirtBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsQuartermaster, ClothingUniformSkirtBase, BaseCommandContraband] # Corvax-Contraband id: ClothingUniformJumpskirtQM name: quartermaster's jumpskirt description: 'What can brown do for you?' @@ -21,7 +21,7 @@ sprite: Clothing/Uniforms/Jumpskirts/Cargo/qm.rsi - type: entity - parent: [ClothingUniformSkirtBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsQuartermaster, ClothingUniformSkirtBase, BaseCommandContraband] # Corvax-Contraband id: ClothingUniformJumpskirtQMTurtleneck name: quartermasters's turtleneck description: A sharp turtleneck made for the hardy work environment of supply. diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/command.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/command.yml index 65d2d4b18a..9f23fa4ac6 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/command.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/command.yml @@ -1,5 +1,5 @@ - type: entity - parent: [ClothingUniformSkirtBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsCaptain, ClothingUniformSkirtBase, BaseCommandContraband] # Corvax-Contraband id: ClothingUniformJumpskirtCaptain name: captain's jumpskirt description: It's a blue jumpskirt with some gold markings denoting the rank of "Captain". @@ -10,7 +10,7 @@ sprite: Clothing/Uniforms/Jumpskirts/Command/captain.rsi - type: entity - parent: [ClothingUniformSkirtBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsHeadOfPersonnel, ClothingUniformSkirtBase, BaseCommandContraband] # Corvax-Contraband id: ClothingUniformJumpskirtHoP name: head of personnel's jumpskirt description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe. @@ -32,7 +32,7 @@ sprite: Clothing/Uniforms/Jumpskirts/Command/commandgeneric.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [BaseCorvaxContraband431JobsCaptain, ClothingUniformSkirtBase] # Corvax-Contraband id: ClothingUniformJumpskirtCapFormalDress name: captain's formal dress description: A dress for special occasions. diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/engineering.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/engineering.yml index c2df99afa0..0b13100d31 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/engineering.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/engineering.yml @@ -1,5 +1,5 @@ - type: entity - parent: [ClothingUniformSkirtBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefEngineer, ClothingUniformSkirtBase, BaseCommandContraband] # Corvax-Contraband id: ClothingUniformJumpskirtChiefEngineer name: chief engineer's jumpskirt description: It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of Chief Engineer. @@ -10,7 +10,7 @@ sprite: Clothing/Uniforms/Jumpskirts/Engineering/ce.rsi - type: entity - parent: [ClothingUniformSkirtBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefEngineer, ClothingUniformSkirtBase, BaseCommandContraband] # Corvax-Contraband id: ClothingUniformJumpskirtChiefEngineerTurtle name: chief engineer's turtleneck description: A yellow turtleneck designed specifically for work in conditions of the engineering department. @@ -21,7 +21,7 @@ sprite: Clothing/Uniforms/Jumpskirts/Engineering/ce_turtle.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [BaseCorvaxContraband431JobsStationEngineer, ClothingUniformSkirtBase] # Corvax-Contraband id: ClothingUniformJumpskirtEngineering name: engineering jumpskirt description: If this suit was non-conductive, maybe engineers would actually do their damn job. @@ -32,7 +32,7 @@ sprite: Clothing/Uniforms/Jumpskirts/Engineering/engineering.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [BaseCorvaxContraband431JobsAtmosphericTechnician, ClothingUniformSkirtBase] # Corvax-Contraband id: ClothingUniformJumpskirtAtmos name: atmospheric technician jumpskirt description: I am at work. I can't leave work. Work is breathing. I am testing air quality. @@ -43,7 +43,7 @@ sprite: Clothing/Uniforms/Jumpskirts/Engineering/atmosf.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [BaseCorvaxContraband431JobsSeniorEngineerStationEngineer, ClothingUniformSkirtBase] # Corvax-Contraband id: ClothingUniformJumpskirtSeniorEngineer name: senior engineer jumpskirt description: A sign of skill and prestige within the engineering department. diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/medical.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/medical.yml index 76e9896402..f7f778c957 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/medical.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/medical.yml @@ -1,5 +1,5 @@ - type: entity - parent: ClothingUniformSkirtBase + parent: [BaseCorvaxContraband431JobsChemist, ClothingUniformSkirtBase] # Corvax-Contraband id: ClothingUniformJumpskirtChemistry name: chemistry jumpskirt description: There's some odd stains on this jumpskirt. Hm. @@ -32,7 +32,7 @@ sprite: Clothing/Uniforms/Jumpskirts/Medical/genetics.rsi - type: entity - parent: [ClothingUniformSkirtBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefMedicalOfficer, ClothingUniformSkirtBase, BaseCommandContraband] # Corvax-Contraband id: ClothingUniformJumpskirtCMO name: chief medical officer's jumpskirt description: It's a jumpskirt worn by those with the experience to be Chief Medical Officer. It provides minor biological protection. @@ -43,7 +43,7 @@ sprite: Clothing/Uniforms/Jumpskirts/Medical/cmo.rsi - type: entity - parent: [ClothingUniformSkirtBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefMedicalOfficer, ClothingUniformSkirtBase, BaseCommandContraband] # Corvax-Contraband id: ClothingUniformJumpskirtCMOTurtle name: chief medical officer's turtleneck jumpskirt description: It's a turtleneck worn by those with the experience to be Chief Medical Officer. It provides minor biological protection. @@ -54,7 +54,7 @@ sprite: Clothing/Uniforms/Jumpskirts/Medical/cmo_turtle.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [BaseCorvaxContraband431JobsMedicalDoctor, ClothingUniformSkirtBase] # Corvax-Contraband id: ClothingUniformJumpskirtMedicalDoctor name: medical doctor jumpskirt description: It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel. @@ -65,7 +65,7 @@ sprite: Clothing/Uniforms/Jumpskirts/Medical/medical.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [BaseCorvaxContraband431JobsParamedic, ClothingUniformSkirtBase] # Corvax-Contraband id: ClothingUniformJumpskirtParamedic name: paramedic jumpskirt description: It's got a plus on it, that's a good thing right? diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/science.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/science.yml index c5104ef3e3..48d0bf7a41 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/science.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/science.yml @@ -1,5 +1,5 @@ - type: entity - parent: [ClothingUniformSkirtBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsResearchDirector, ClothingUniformSkirtBase, BaseCommandContraband] # Corvax-Contraband id: ClothingUniformJumpskirtResearchDirector name: research director's turtleneck description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants. @@ -10,7 +10,7 @@ sprite: Clothing/Uniforms/Jumpskirts/Science/rnd.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [BaseCorvaxContraband431JobsScientist, ClothingUniformSkirtBase] # Corvax-Contraband id: ClothingUniformJumpskirtScientist name: scientist jumpskirt description: It's made of a special fiber that increases perceived intelligence and decreases personal ethics. It has markings that denote the wearer as a scientist. @@ -32,7 +32,7 @@ sprite: Clothing/Uniforms/Jumpskirts/Science/roboticist.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [BaseCorvaxContraband431JobsScientistSeniorResearcher, ClothingUniformSkirtBase] # Corvax-Contraband id: ClothingUniformJumpskirtSeniorResearcher name: senior researcher jumpskirt description: A sign of skill and prestige within the science department. diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/security.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/security.yml index b2daf087f2..a5b2e4448a 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/security.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/security.yml @@ -1,5 +1,5 @@ - type: entity - parent: ClothingUniformSkirtBase + parent: [BaseCorvaxContraband431JobsDetective, ClothingUniformSkirtBase] # Corvax-Contraband id: ClothingUniformJumpskirtDetective name: hard-worn suitskirt description: Someone who wears this means business. @@ -10,7 +10,7 @@ sprite: Clothing/Uniforms/Jumpskirts/Security/detective.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [BaseCorvaxContraband431JobsDetective, ClothingUniformSkirtBase] # Corvax-Contraband id: ClothingUniformJumpskirtDetectiveGrey name: noir suitskirt description: A hard-boiled private investigator's grey suit, complete with tie clip. @@ -21,7 +21,7 @@ sprite: Clothing/Uniforms/Jumpskirts/Security/detective_grey.rsi - type: entity - parent: [ClothingUniformSkirtBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsHeadOfSecurity, ClothingUniformSkirtBase, BaseCommandContraband] # Corvax-Contraband id: ClothingUniformJumpskirtHoS name: head of security's jumpskirt description: It's bright red and rather crisp, much like security's victims tend to be. @@ -46,7 +46,7 @@ sprite: Clothing/Uniforms/Jumpskirts/Security/hos.rsi - type: entity - parent: [ClothingUniformSkirtBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsHeadOfSecurity, ClothingUniformSkirtBase, BaseCommandContraband] # Corvax-Contraband id: ClothingUniformJumpskirtHoSAlt name: head of security's turtleneck description: It's a turtleneck worn by those strong and disciplined enough to achieve the position of Head of Security. @@ -68,7 +68,7 @@ sprite: Clothing/Uniforms/Jumpskirts/Security/hos_parade.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [BaseCorvaxContraband431JobsBrigmedic, ClothingUniformSkirtBase] # Corvax-Contraband id: ClothingUniformJumpskirtBrigmedic name: brigmedic jumpskirt description: This uniform is issued to qualified personnel who have been trained. No one cares that the training took half a day. @@ -119,7 +119,7 @@ - WhitelistChameleon - type: entity - parent: [ClothingUniformSkirtBase, BaseSecurityContraband] + parent: [BaseCorvaxContraband431DepartmentsSecurityJobsSecurityOfficer, ClothingUniformSkirtBase, BaseSecurityContraband] # Corvax-Contraband id: ClothingUniformJumpskirtSec name: security jumpskirt description: A jumpskirt made of strong material, providing robust protection. @@ -144,7 +144,7 @@ sprite: Clothing/Uniforms/Jumpskirts/Security/security.rsi - type: entity - parent: [ClothingUniformSkirtBase, BaseSecurityContraband] + parent: [BaseCorvaxContraband431DepartmentsSecurityJobsWarden, ClothingUniformSkirtBase, BaseSecurityContraband] # Corvax-Contraband id: ClothingUniformJumpskirtWarden name: warden's uniform description: A formal security suit for officers complete with Nanotrasen belt buckle. @@ -169,7 +169,7 @@ sprite: Clothing/Uniforms/Jumpskirts/Security/warden.rsi - type: entity - parent: [ClothingUniformSkirtBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsHeadOfSecurity, ClothingUniformSkirtBase, BaseCommandContraband] # Corvax-Contraband id: ClothingUniformJumpskirtHosFormal name: hos's formal dress description: A dress for special occasions. @@ -180,7 +180,7 @@ sprite: Clothing/Uniforms/Jumpskirts/Security/hosformaldress.rsi - type: entity - parent: [ClothingUniformSkirtBase, BaseSecurityContraband] + parent: [BaseCorvaxContraband431DepartmentsSecurityJobsSecurityOfficerSeniorOfficer, ClothingUniformSkirtBase, BaseSecurityContraband] # Corvax-Contraband id: ClothingUniformJumpskirtSeniorOfficer name: senior officer jumpskirt description: A sign of skill and prestige within the security department. @@ -191,7 +191,7 @@ sprite: Clothing/Uniforms/Jumpskirts/Security/senior_officer.rsi - type: entity - parent: [ClothingUniformSkirtBase, BaseSecurityContraband] + parent: [BaseCorvaxContraband431DepartmentsSecurityJobsSecurityCadetSecurityOfficer, ClothingUniformSkirtBase, BaseSecurityContraband] # Corvax-Contraband id: ClothingUniformJumpskirtSecGrey name: grey security jumpskirt description: A tactical relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood. diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/service.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/service.yml index 50eee277e1..ed575e5f13 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/service.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/service.yml @@ -10,7 +10,7 @@ sprite: Clothing/Uniforms/Jumpskirts/Service/bartender.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [BaseCorvaxContraband431JobsChaplain, ClothingUniformSkirtBase] # Corvax-Contraband id: ClothingUniformJumpskirtChaplain name: chaplain's jumpskirt description: It's a black jumpskirt, often worn by religious folk. @@ -21,7 +21,7 @@ sprite: Clothing/Uniforms/Jumpskirts/Service/chaplain.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [BaseCorvaxContraband431JobsChef, ClothingUniformSkirtBase] # Corvax-Contraband id: ClothingUniformJumpskirtChef name: chef uniform description: Can't cook without this. @@ -43,7 +43,7 @@ sprite: Clothing/Uniforms/Jumpskirts/Service/hydro.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [BaseCorvaxContraband431JobsJanitor, ClothingUniformSkirtBase] # Corvax-Contraband id: ClothingUniformJumpskirtJanitor name: janitor jumpskirt description: The jumpskirt for the poor sop with a mop. diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/cargo.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/cargo.yml index 65e0f808e8..812afead0b 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/cargo.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/cargo.yml @@ -1,5 +1,5 @@ - type: entity - parent: [ClothingUniformBase, ClothingUniformFoldableBase] + parent: [BaseCorvaxContraband431JobsCargoTechnician, ClothingUniformBase, ClothingUniformFoldableBase] # Corvax-Contraband id: ClothingUniformJumpsuitCargo name: cargo tech jumpsuit description: A sturdy jumpsuit, issued to members of the Cargo department. @@ -8,7 +8,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Cargo/cargotech.rsi - type: entity - parent: [ClothingUniformBase, ClothingUniformFoldableBase] + parent: [BaseCorvaxContraband431JobsSalvageSpecialist, ClothingUniformBase, ClothingUniformFoldableBase] # Corvax-Contraband id: ClothingUniformJumpsuitSalvageSpecialist name: salvage specialist's jumpsuit description: It's a snappy jumpsuit with a sturdy set of overalls. It's very dirty. @@ -17,7 +17,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Cargo/salvage.rsi - type: entity - parent: [ClothingUniformBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsQuartermaster, ClothingUniformBase, BaseCommandContraband] # Corvax-Contraband id: ClothingUniformJumpsuitQM name: quartermaster's jumpsuit description: 'What can brown do for you?' @@ -28,7 +28,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Cargo/qm.rsi - type: entity - parent: [ClothingUniformBase, ClothingUniformFoldableBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsQuartermaster, ClothingUniformBase, ClothingUniformFoldableBase, BaseCommandContraband] # Corvax-Contraband id: ClothingUniformJumpsuitQMTurtleneck name: quartermasters's turtleneck description: A sharp turtleneck made for the hardy work environment of supply. @@ -39,7 +39,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Cargo/qmturtle.rsi - type: entity - parent: [ClothingUniformBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsQuartermaster, ClothingUniformBase, BaseCommandContraband] # Corvax-Contraband id: ClothingUniformJumpsuitQMFormal name: quartermasters's formal suit description: Inspired by the quartermasters of military's past, the perfect outfit for supplying a formal occasion. diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/centcomm.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/centcomm.yml index 9e906ffa0b..4280b7b6c8 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/centcomm.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/centcomm.yml @@ -21,7 +21,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi - type: entity - parent: [ ClothingUniformBase, BaseCentcommContraband ] + parent: [BaseCorvaxContraband431DepartmentsCentralCommandJobsCentralCommandOfficial, ClothingUniformBase, BaseCentcommContraband] # Corvax-Contraband id: ClothingUniformJumpsuitCentcomOfficial name: CentComm official's jumpsuit description: It's a jumpsuit worn by CentComm's officials. @@ -70,6 +70,12 @@ name: ERT engineering uniform description: A special suit made for the elite engineers under CentComm. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [CentralCommand] + allowedJobs: [ERTEngineer] + # Corvax-Contraband-end - type: Sprite sprite: Clothing/Uniforms/Jumpsuits/Centcomm/ert_engineer.rsi - type: Clothing @@ -81,6 +87,12 @@ name: ERT janitorial uniform description: A special suit made for the elite janitors under CentComm. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [CentralCommand] + allowedJobs: [ERTJanitor] + # Corvax-Contraband-end - type: Sprite sprite: Clothing/Uniforms/Jumpsuits/Centcomm/ert_janitor.rsi - type: Clothing @@ -103,6 +115,12 @@ name: ERT medical uniform description: A special suit made for the elite medics under CentComm. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [CentralCommand] + allowedJobs: [ERTMedical] + # Corvax-Contraband-end - type: Sprite sprite: Clothing/Uniforms/Jumpsuits/Centcomm/ert_medic.rsi - type: Clothing @@ -114,6 +132,12 @@ name: ERT security uniform description: A special suit made for the elite security under CentComm. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [CentralCommand] + allowedJobs: [ERTSecurity] + # Corvax-Contraband-end - type: Sprite sprite: Clothing/Uniforms/Jumpsuits/Centcomm/ert_security.rsi - type: Clothing diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/command.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/command.yml index 2cf875fc90..8f5e25871a 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/command.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/command.yml @@ -1,5 +1,5 @@ - type: entity - parent: [ClothingUniformBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsCaptain, ClothingUniformBase, BaseCommandContraband] # Corvax-Contraband id: ClothingUniformJumpsuitCaptain name: captain's jumpsuit description: It's a blue jumpsuit with some gold markings denoting the rank of "Captain". @@ -10,7 +10,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Command/captain.rsi - type: entity - parent: [ClothingUniformBase, BaseCommandContraband, ClothingUniformFoldableBase] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsHeadOfPersonnel, ClothingUniformBase, BaseCommandContraband, ClothingUniformFoldableBase] # Corvax-Contraband id: ClothingUniformJumpsuitHoP name: head of personnel's jumpsuit description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe. @@ -41,7 +41,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Command/nanotrasen.rsi - type: entity - parent: [ClothingUniformBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsCaptain, ClothingUniformBase, BaseCommandContraband] # Corvax-Contraband id: ClothingUniformJumpsuitCapFormal name: captain's formal suit description: A suit for special occasions. diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/engineering.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/engineering.yml index 0fd5cc3fc8..8a2fce6c1a 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/engineering.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/engineering.yml @@ -1,5 +1,5 @@ - type: entity - parent: [ClothingUniformBase, BaseCommandContraband, ClothingUniformFoldableBase] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefEngineer, ClothingUniformBase, BaseCommandContraband, ClothingUniformFoldableBase] # Corvax-Contraband id: ClothingUniformJumpsuitChiefEngineer name: chief engineer's jumpsuit description: It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of Chief Engineer. @@ -8,7 +8,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Engineering/ce.rsi - type: entity - parent: [ClothingUniformBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefEngineer, ClothingUniformBase, BaseCommandContraband] # Corvax-Contraband id: ClothingUniformJumpsuitChiefEngineerTurtle name: chief engineer's turtleneck description: A yellow turtleneck designed specifically for work in conditions of the engineering department. @@ -19,7 +19,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Engineering/ce_turtle.rsi - type: entity - parent: [ClothingUniformBase, ClothingUniformFoldableBase] + parent: [BaseCorvaxContraband431JobsStationEngineer, ClothingUniformBase, ClothingUniformFoldableBase] # Corvax-Contraband id: ClothingUniformJumpsuitEngineering name: engineering jumpsuit description: If this suit was non-conductive, maybe engineers would actually do their damn job. @@ -28,7 +28,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Engineering/engineering.rsi - type: entity - parent: [ClothingUniformBase, ClothingUniformFoldableBase] + parent: [BaseCorvaxContraband431JobsStationEngineer, ClothingUniformBase, ClothingUniformFoldableBase] # Corvax-Contraband id: ClothingUniformJumpsuitEngineeringHazard name: hazard jumpsuit description: Woven in a grungy, warm orange. Lets others around you know that you really mean business when it comes to work. @@ -37,7 +37,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Engineering/engineering_hazard.rsi - type: entity - parent: [ClothingUniformBase, ClothingUniformFoldableBase] + parent: [BaseCorvaxContraband431JobsAtmosphericTechnician, ClothingUniformBase, ClothingUniformFoldableBase] # Corvax-Contraband id: ClothingUniformJumpsuitAtmos name: atmospheric technician jumpsuit description: I am at work. I can't leave work. Work is breathing. I am testing air quality. @@ -46,7 +46,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Engineering/atmos.rsi - type: entity - parent: [ClothingUniformBase, ClothingUniformFoldableBase] + parent: [BaseCorvaxContraband431JobsAtmosphericTechnician, ClothingUniformBase, ClothingUniformFoldableBase] # Corvax-Contraband id: ClothingUniformJumpsuitAtmosCasual name: atmospheric technician's casual jumpsuit description: Might as well relax with a job as easy as yours. @@ -55,7 +55,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Engineering/atmos_casual.rsi - type: entity - parent: ClothingUniformBase + parent: [BaseCorvaxContraband431JobsSeniorEngineerStationEngineer, ClothingUniformBase] # Corvax-Contraband id: ClothingUniformJumpsuitSeniorEngineer name: senior engineer jumpsuit description: A sign of skill and prestige within the engineering department. diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/medical.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/medical.yml index 1a600e42c4..d7eda28c93 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/medical.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/medical.yml @@ -1,5 +1,5 @@ - type: entity - parent: [ClothingUniformBase, ClothingUniformFoldableBase] + parent: [BaseCorvaxContraband431JobsChemist, ClothingUniformBase, ClothingUniformFoldableBase] # Corvax-Contraband id: ClothingUniformJumpsuitChemistry name: chemistry jumpsuit description: There's some odd stains on this jumpsuit. Hm. @@ -30,7 +30,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Medical/genetics.rsi - type: entity - parent: [ClothingUniformBase, BaseCommandContraband, ClothingUniformFoldableBase] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefMedicalOfficer, ClothingUniformBase, BaseCommandContraband, ClothingUniformFoldableBase] # Corvax-Contraband id: ClothingUniformJumpsuitCMO name: chief medical officer's jumpsuit description: It's a jumpsuit worn by those with the experience to be Chief Medical Officer. It provides minor biological protection. @@ -39,7 +39,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Medical/cmo.rsi - type: entity - parent: [ClothingUniformBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefMedicalOfficer, ClothingUniformBase, BaseCommandContraband] # Corvax-Contraband id: ClothingUniformJumpsuitCMOTurtle name: chief medical officer's turtleneck jumpsuit description: It's a turtleneck worn by those with the experience to be Chief Medical Officer. It provides minor biological protection. @@ -50,7 +50,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Medical/cmo_turtle.rsi - type: entity - parent: [ClothingUniformBase, ClothingUniformFoldableBase] + parent: [BaseCorvaxContraband431JobsMedicalDoctor, ClothingUniformBase, ClothingUniformFoldableBase] # Corvax-Contraband id: ClothingUniformJumpsuitMedicalDoctor name: medical doctor jumpsuit description: It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel. @@ -59,7 +59,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Medical/medical.rsi - type: entity - parent: ClothingUniformBase + parent: [BaseCorvaxContraband431JobsParamedic, ClothingUniformBase] # Corvax-Contraband id: ClothingUniformJumpsuitParamedic name: paramedic jumpsuit description: It's got a plus on it, that's a good thing right? diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/science.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/science.yml index 2c0cc35553..8040fbe0dd 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/science.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/science.yml @@ -1,5 +1,5 @@ - type: entity - parent: [ClothingUniformBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsResearchDirector, ClothingUniformBase, BaseCommandContraband] # Corvax-Contraband id: ClothingUniformJumpsuitResearchDirector name: research director's turtleneck description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants. @@ -10,7 +10,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Science/rnd.rsi - type: entity - parent: [ClothingUniformBase, ClothingUniformFoldableBase] + parent: [BaseCorvaxContraband431JobsScientist, ClothingUniformBase, ClothingUniformFoldableBase] # Corvax-Contraband id: ClothingUniformJumpsuitScientist name: scientist jumpsuit description: It's made of a special fiber that increases perceived intelligence and decreases personal ethics. It has markings that denote the wearer as a scientist. @@ -39,7 +39,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Science/roboticist.rsi - type: entity - parent: ClothingUniformBase + parent: [BaseCorvaxContraband431JobsScientistSeniorResearcher, ClothingUniformBase] # Corvax-Contraband id: ClothingUniformJumpsuitSeniorResearcher name: senior researcher jumpsuit description: A sign of skill and prestige within the science department. diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/security.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/security.yml index cb49540b32..ec2a67cbd4 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/security.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/security.yml @@ -1,5 +1,5 @@ - type: entity - parent: ClothingUniformBase + parent: [BaseCorvaxContraband431JobsDetective, ClothingUniformBase] # Corvax-Contraband id: ClothingUniformJumpsuitDetective name: hard-worn suit description: Someone who wears this means business. @@ -10,7 +10,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Security/detective.rsi - type: entity - parent: ClothingUniformBase + parent: [BaseCorvaxContraband431JobsDetective, ClothingUniformBase] # Corvax-Contraband id: ClothingUniformJumpsuitDetectiveGrey name: noir suit description: A hard-boiled private investigator's grey suit, complete with tie clip. @@ -21,7 +21,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Security/detective_grey.rsi - type: entity - parent: [ClothingUniformBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsHeadOfSecurity, ClothingUniformBase, BaseCommandContraband] # Corvax-Contraband id: ClothingUniformJumpsuitHoS name: head of security's jumpsuit description: It's bright red and rather crisp, much like security's victims tend to be. @@ -44,7 +44,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Security/hos.rsi - type: entity - parent: [ClothingUniformBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsHeadOfSecurity, ClothingUniformBase, BaseCommandContraband] # Corvax-Contraband id: ClothingUniformJumpsuitHoSAlt name: head of security's turtleneck description: It's a turtleneck worn by those strong and disciplined enough to achieve the position of Head of Security. @@ -88,7 +88,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Security/hos_parade.rsi - type: entity - parent: ClothingUniformBase + parent: [BaseCorvaxContraband431JobsBrigmedic, ClothingUniformBase] # Corvax-Contraband id: ClothingUniformJumpsuitBrigmedic name: brigmedic jumpsuit description: This uniform is issued to qualified personnel who have been trained. No one cares that the training took half a day. @@ -139,7 +139,7 @@ - WhitelistChameleon - type: entity - parent: [ClothingUniformBase, BaseSecurityContraband, ClothingUniformFoldableBase] + parent: [BaseCorvaxContraband431DepartmentsSecurityJobsSecurityOfficer, ClothingUniformBase, BaseSecurityContraband, ClothingUniformFoldableBase] # Corvax-Contraband id: ClothingUniformJumpsuitSec name: security jumpsuit description: A jumpsuit made of strong material, providing robust protection. @@ -171,7 +171,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Security/security_blue.rsi - type: entity - parent: [ClothingUniformBase, BaseSecurityContraband] + parent: [BaseCorvaxContraband431DepartmentsSecurityJobsSecurityCadetSecurityOfficer, ClothingUniformBase, BaseSecurityContraband] # Corvax-Contraband id: ClothingUniformJumpsuitSecGrey name: grey security jumpsuit description: A tactical relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood. @@ -182,7 +182,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Security/security_grey.rsi - type: entity - parent: [ClothingUniformBase, BaseSecurityContraband] + parent: [BaseCorvaxContraband431DepartmentsSecurityJobsSecurityOfficer, ClothingUniformBase, BaseSecurityContraband] # Corvax-Contraband id: ClothingUniformSecurityTrooper name: trooper uniform description: A formal uniform issued to the Nanotrasen Troopers, usually it comes with a car. @@ -193,7 +193,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Security/security_trooper.rsi - type: entity - parent: [ClothingUniformBase, BaseSecurityContraband] + parent: [BaseCorvaxContraband431DepartmentsSecurityJobsWarden, ClothingUniformBase, BaseSecurityContraband] # Corvax-Contraband id: ClothingUniformJumpsuitWarden name: warden's uniform description: A formal security suit for officers complete with Nanotrasen belt buckle. @@ -216,7 +216,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Security/warden.rsi - type: entity - parent: [ClothingUniformBase, BaseCommandContraband] + parent: [BaseCorvaxContraband431DepartmentsCommandJobsHeadOfSecurity, ClothingUniformBase, BaseCommandContraband] # Corvax-Contraband id: ClothingUniformJumpsuitHosFormal name: hos's formal suit description: A suit for special occasions. @@ -227,7 +227,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Security/hosformal.rsi - type: entity - parent: [ClothingUniformBase, BaseSecurityContraband] + parent: [BaseCorvaxContraband431DepartmentsSecurityJobsSecurityOfficerSeniorOfficer, ClothingUniformBase, BaseSecurityContraband] # Corvax-Contraband id: ClothingUniformJumpsuitSeniorOfficer name: senior officer jumpsuit description: A sign of skill and prestige within the security department. diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/service.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/service.yml index e597c8ad92..c2c0493f21 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/service.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/service.yml @@ -34,7 +34,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Service/bartender_purple.rsi - type: entity - parent: ClothingUniformBase + parent: [BaseCorvaxContraband431JobsChaplain, ClothingUniformBase] # Corvax-Contraband id: ClothingUniformJumpsuitChaplain name: chaplain's jumpsuit description: It's a black jumpsuit, often worn by religious folk. @@ -45,7 +45,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Service/chaplain.rsi - type: entity - parent: ClothingUniformBase + parent: [BaseCorvaxContraband431JobsChef, ClothingUniformBase] # Corvax-Contraband id: ClothingUniformJumpsuitChef name: chef uniform description: Can't cook without this. @@ -117,7 +117,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Service/hydro.rsi - type: entity - parent: [ClothingUniformBase, ClothingUniformFoldableBase] + parent: [BaseCorvaxContraband431JobsJanitor, ClothingUniformBase, ClothingUniformFoldableBase] # Corvax-Contraband id: ClothingUniformJumpsuitJanitor name: janitor jumpsuit description: The jumpsuit for the poor sop with a mop. diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml index 3d48763b0e..8121f07e53 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -85,7 +85,7 @@ - type: entity id: BorgChassisSyndicateAssault - parent: BaseBorgChassisSyndicate + parent: [BaseCorvaxContraband436, BaseBorgChassisSyndicate] # Corvax-Contraband name: syndicate assault cyborg description: A lean, mean killing machine with access to a variety of deadly modules. components: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 2d25d2127b..26884d9bd4 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -3413,7 +3413,7 @@ - type: entity name: syndicat id: MobCatSyndy - parent: MobCatSpace + parent: [BaseCorvaxContraband435, MobCatSpace] # Corvax-Contraband description: Explosive kitten. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index f739ee0616..2b1ea5f4da 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -231,7 +231,7 @@ - id: SheetSteel1 - type: entity - parent: ProduceBaseRuminant + parent: [ProduceBaseRuminant] id: Nettle name: nettle description: Stingy little prick. @@ -262,7 +262,7 @@ grindableSolutionName: food - type: entity - parent: [ ProduceBase, BaseMajorContraband ] + parent: [BaseCorvaxContraband432JobsBotanist, ProduceBase, BaseMajorContraband] # Corvax-Contraband id: DeathNettle name: death nettle description: This nettle's out for blood. @@ -1808,7 +1808,7 @@ - type: entity name: fly amanita - parent: FoodProduceBase + parent: [BaseCorvaxContraband432JobsBotanist, FoodProduceBase] # Corvax-Contraband id: FoodFlyAmanita description: A delicious-looking mushroom like you see in those cartoons. components: @@ -1841,7 +1841,7 @@ - type: entity name: gatfruit - parent: [ FoodProduceBase, BaseSyndicateContraband, BaseSlicingRefinable ] + parent: [BaseCorvaxContraband434DepartmentsSecurity, FoodProduceBase, BaseSyndicateContraband, BaseSlicingRefinable] # Corvax-Contraband id: FoodGatfruit description: A delicious, gun-shaped fruit with a thick wooden stem. components: @@ -2014,7 +2014,7 @@ name: koibean description: These beans seem a little bit fishy. id: FoodKoibean - parent: ProduceBaseRuminant + parent: [ProduceBaseRuminant] components: - type: Sprite sprite: Objects/Specific/Hydroponics/koibean.rsi @@ -2419,7 +2419,7 @@ Burger: Pea - type: entity - parent: FoodProduceBase + parent: [BaseCorvaxContraband432JobsBotanist, FoodProduceBase] # Corvax-Contraband id: FoodWorldPeas name: cluster of world peas description: It's rumored to bring peace to any who consume it. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml index 63b341936a..b2867d1c22 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml @@ -179,7 +179,7 @@ - type: entity id: CigPackSyndicate - parent: [CigPackBase, BaseSyndicateContraband] + parent: [CigPackBase] # Corvax-Contraband BaseSyndicateContraband name: Interdyne herbals packet description: Elite cigarettes for elite syndicate agents. Infused with medicine for when you need to do more than calm your nerves. components: diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index 11f9f6a013..6992f0d97c 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -79,7 +79,7 @@ - type: entity id: SecurityTechFabCircuitboard - parent: BaseMachineCircuitboard + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseMachineCircuitboard] # Corvax-Contraband name: security techfab machine board description: A machine printed circuit board for a security techfab. components: @@ -96,7 +96,7 @@ - type: entity id: AmmoTechFabCircuitboard - parent: BaseMachineCircuitboard + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseMachineCircuitboard] # Corvax-Contraband name: ammo techfab circuit board description: A machine printed circuit board for an ammo techfab. components: @@ -258,7 +258,7 @@ - type: entity id: ArtifactAnalyzerMachineCircuitboard - parent: BaseMachineCircuitboard + parent: [BaseCorvaxContraband431DepartmentsScience, BaseMachineCircuitboard] # Corvax-Contraband name: artifact analyzer machine board description: A machine printed circuit board for an artifact analyzer. components: diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml index d1e01dc963..d90ce32e12 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml @@ -64,7 +64,7 @@ prototype: ComputerMedicalRecords - type: entity - parent: BaseComputerCircuitboard + parent: [BaseCorvaxContraband433DepartmentsCommandSecurity, BaseComputerCircuitboard] # Corvax-Contraband id: CriminalRecordsComputerCircuitboard name: criminal records computer board description: A computer printed circuit board for a criminal records computer. @@ -239,7 +239,7 @@ stealGroup: CargoShuttleConsoleCircuitboard - type: entity - parent: BaseComputerCircuitboard + parent: [BaseCorvaxContraband433DepartmentsCommandSecurity, BaseComputerCircuitboard] # Corvax-Contraband id: SurveillanceCameraMonitorCircuitboard name: surveillance camera monitor board description: A computer printed circuit board for a surveillance camera monitor. @@ -331,7 +331,7 @@ prototype: ComputerCrewMonitoring - type: entity - parent: [BaseComputerCircuitboard, BaseCommandContraband] + parent: [BaseCorvaxContraband433DepartmentsCommand, BaseComputerCircuitboard, BaseCommandContraband] # Corvax-Contraband id: IDComputerCircuitboard name: ID card computer board description: A computer printed circuit board for an ID card console. @@ -358,7 +358,7 @@ prototype: computerBodyScanner - type: entity - parent: [ BaseComputerCircuitboard, BaseCommandContraband ] + parent: [BaseCorvaxContraband433DepartmentsCommand, BaseComputerCircuitboard, BaseCommandContraband] # Corvax-Contraband id: CommsComputerCircuitboard name: communications computer board description: A computer printed circuit board for a communications console. diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/law_boards.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/law_boards.yml index f1f0fd8d48..7e3fe20167 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/law_boards.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/law_boards.yml @@ -114,7 +114,7 @@ - type: entity id: AntimovCircuitBoard - parent: [BaseSiliconLawboard, BaseSyndicateContraband] + parent: [BaseCorvaxContraband436, BaseSiliconLawboard, BaseSyndicateContraband] # Corvax-Contraband name: law board (Antimov) description: An electronics board containing the Antimov lawset. components: diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/chimp_upgrade_kit.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/chimp_upgrade_kit.yml index aeacc3947a..e93e96dda3 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/chimp_upgrade_kit.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/chimp_upgrade_kit.yml @@ -1,6 +1,6 @@ - type: entity name: C.H.I.M.P. handcannon upgrade chip - parent: [BaseItem, BaseSyndicateContraband] + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseItem, BaseSyndicateContraband] # Corvax-Contraband id: WeaponPistolCHIMPUpgradeKit description: An experimental upgrade kit for the C.H.I.M.P. components: diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/singularity_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/singularity_beacon.yml index 4a03e5e3fa..f2bd67057d 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/singularity_beacon.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/singularity_beacon.yml @@ -1,6 +1,6 @@ - type: entity id: SingularityBeacon - parent: [BaseMachinePowered, BaseSyndicateContraband, BaseMachineDestructible] + parent: [BaseCorvaxContraband436, BaseMachinePowered, BaseSyndicateContraband, BaseMachineDestructible] # Corvax-Contraband name: singularity beacon description: A syndicate device that attracts the singularity. If it's loose and you're seeing this, run. components: diff --git a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml index aa9bcfa2d3..5a8cddc586 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml @@ -94,7 +94,7 @@ - type: NetProbeCartridge - type: entity - parent: BasePDACartridge + parent: [BaseCorvaxContraband433DepartmentsCommandSecurity, BasePDACartridge] # Corvax-Contraband id: LogProbeCartridge name: LogProbe cartridge description: A program for getting access logs from devices. @@ -117,7 +117,7 @@ - Forensics - type: entity - parent: BasePDACartridge + parent: [BaseCorvaxContraband433DepartmentsCommandSecurity, BasePDACartridge] # Corvax-Contraband id: WantedListCartridge name: Wanted list cartridge description: A program to get a list of wanted persons. @@ -139,7 +139,7 @@ stealGroup: WantedListCartridge - type: entity - parent: BasePDACartridge + parent: [BaseCorvaxContraband431DepartmentsMedical, BasePDACartridge] # Corvax-Contraband id: MedTekCartridge name: MedTek cartridge description: A program that provides medical diagnostic tools. diff --git a/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml b/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml index c1d0df2c6c..8a847f4f50 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml @@ -1,6 +1,6 @@ - type: entity name: forensic scanner - parent: [ BaseItem, BaseSecurityContraband ] + parent: [BaseCorvaxContraband433DepartmentsCommandSecurity, BaseItem, BaseSecurityContraband] # Corvax-Contraband id: ForensicScanner description: A handheld device that can scan objects for fingerprints and fibers. components: diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 9d04ecf468..542900554f 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -195,6 +195,12 @@ name: technical assistant PDA description: Why isn't it yellow? components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [TechnicalAssistant] + # Corvax-Contraband-end - type: Pda id: TechnicalAssistantIDCard - type: Appearance @@ -214,6 +220,12 @@ name: medical intern PDA description: Why isn't it white? components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [MedicalIntern] + # Corvax-Contraband-end - type: Pda id: MedicalInternIDCard - type: Appearance @@ -236,6 +248,12 @@ name: security cadet PDA description: Why isn't it red? components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [SecurityCadet] + # Corvax-Contraband-end - type: Pda id: SecurityCadetIDCard - type: Appearance @@ -255,6 +273,12 @@ name: research assistant PDA description: Why isn't it purple? components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [ResearchAssistant] + # Corvax-Contraband-end - type: Pda id: ResearchAssistantIDCard - type: Appearance @@ -274,6 +298,12 @@ name: service worker PDA description: Why isn't it gray? components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [ServiceWorker] + # Corvax-Contraband-end - type: Pda id: ServiceWorkerIDCard - type: Appearance @@ -288,7 +318,7 @@ state: pda-internservice - type: entity - parent: BasePDA + parent: [BaseCorvaxContraband431JobsChef, BasePDA] # Corvax-Contraband id: ChefPDA name: chef PDA description: Covered in grease and flour. @@ -306,7 +336,7 @@ state: pda-cook - type: entity - parent: BasePDA + parent: [BaseCorvaxContraband431JobsBotanist, BasePDA] # Corvax-Contraband id: BotanistPDA name: botanist PDA description: Has an earthy scent. @@ -330,6 +360,12 @@ name: clown PDA description: Looks can be deceiving. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [Clown] + # Corvax-Contraband-end - type: Pda id: ClownIDCard penSlot: @@ -390,6 +426,12 @@ name: mime PDA description: Suprisingly not on mute. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [Mime] + # Corvax-Contraband-end - type: Pda id: MimeIDCard paiSlot: @@ -443,7 +485,7 @@ - type: entity name: chaplain PDA - parent: BasePDA + parent: [BaseCorvaxContraband431JobsChaplain, BasePDA] # Corvax-Contraband id: ChaplainPDA description: God's chosen PDA. components: @@ -472,7 +514,7 @@ - type: entity name: quartermaster PDA - parent: BasePDA + parent: [BaseCorvaxContraband431JobsQuartermaster, BasePDA] # Corvax-Contraband id: QuartermasterPDA description: PDA for the guy that orders the guns. components: @@ -499,7 +541,7 @@ - id: AstroNavCartridge - type: entity - parent: BasePDA + parent: [BaseCorvaxContraband431JobsCargoTechnician, BasePDA] # Corvax-Contraband id: CargoPDA name: cargo PDA description: PDA for the guys that order the pizzas. @@ -517,7 +559,7 @@ state: pda-cargo - type: entity - parent: BasePDA + parent: [BaseCorvaxContraband431JobsSalvageSpecialist, BasePDA] # Corvax-Contraband id: SalvagePDA name: salvage PDA description: Smells like ash. @@ -545,7 +587,7 @@ - id: AstroNavCartridge - type: entity - parent: BasePDA + parent: [BaseCorvaxContraband431JobsBartender, BasePDA] # Corvax-Contraband id: BartenderPDA name: bartender PDA description: Smells like beer. @@ -568,6 +610,12 @@ name: librarian PDA description: Smells like books. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [Librarian] + # Corvax-Contraband-end - type: Pda id: LibrarianIDCard penSlot: @@ -603,6 +651,12 @@ name: lawyer PDA description: For lawyers to poach dubious clients. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [Lawyer] + # Corvax-Contraband-end - type: Pda id: LawyerIDCard penSlot: @@ -633,7 +687,7 @@ - DoorBumpOpener - type: entity - parent: BasePDA + parent: [BaseCorvaxContraband431JobsJanitor, BasePDA] # Corvax-Contraband id: JanitorPDA name: janitor PDA description: Smells like bleach. @@ -651,7 +705,7 @@ state: pda-janitor - type: entity - parent: BasePDA + parent: [BaseCorvaxContraband431JobsCaptain, BasePDA] # Corvax-Contraband id: CaptainPDA name: captain PDA description: Surprisingly no different from your PDA. @@ -675,7 +729,7 @@ state: pda-captain - type: entity - parent: BasePDA + parent: [BaseCorvaxContraband431JobsHeadOfPersonnel, BasePDA] # Corvax-Contraband id: HoPPDA name: head of personnel PDA description: Looks like it's been chewed on. @@ -700,7 +754,7 @@ state: pda-hop - type: entity - parent: BasePDA + parent: [BaseCorvaxContraband431JobsChiefEngineer, BasePDA] # Corvax-Contraband id: CEPDA name: chief engineer PDA description: Looks like it's barely been used. @@ -719,7 +773,7 @@ state: pda-ce - type: entity - parent: BasePDA + parent: [BaseCorvaxContraband431JobsStationEngineer, BasePDA] # Corvax-Contraband id: EngineerPDA name: engineer PDA description: Rugged and well-worn. @@ -738,7 +792,7 @@ state: pda-engineer - type: entity - parent: BaseMedicalPDA + parent: [BaseCorvaxContraband431JobsChiefMedicalOfficer, BaseMedicalPDA] # Corvax-Contraband id: CMOPDA name: chief medical officer PDA description: Extraordinarily shiny and sterile. @@ -791,7 +845,7 @@ - DoorBumpOpener - type: entity - parent: BaseMedicalPDA + parent: [BaseCorvaxContraband431JobsParamedic, BaseMedicalPDA] # Corvax-Contraband id: ParamedicPDA name: paramedic PDA description: Shiny and sterile. @@ -810,7 +864,7 @@ state: pda-paramedic - type: entity - parent: BaseMedicalPDA + parent: [BaseCorvaxContraband431JobsChemist, BaseMedicalPDA] # Corvax-Contraband id: ChemistryPDA name: chemistry PDA description: It has a few discolored blotches here and there. @@ -829,7 +883,7 @@ state: pda-chemistry - type: entity - parent: BasePDA + parent: [BaseCorvaxContraband431JobsResearchDirector, BasePDA] # Corvax-Contraband id: RnDPDA name: research director PDA description: It appears surprisingly ordinary. @@ -868,7 +922,7 @@ state: pda-science - type: entity - parent: BaseSecurityPDA + parent: [BaseCorvaxContraband431JobsHeadOfSecurity, BaseSecurityPDA] # Corvax-Contraband id: HoSPDA name: head of security PDA description: Whosoever bears this PDA is the law. @@ -897,7 +951,7 @@ - id: LogProbeCartridge - type: entity - parent: BaseSecurityPDA + parent: [BaseCorvaxContraband431JobsWarden, BaseSecurityPDA] # Corvax-Contraband id: WardenPDA name: warden PDA description: The OS appears to have been jailbroken. @@ -939,6 +993,12 @@ name: CentComm PDA description: Light green sign of walking bureaucracy. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [CentralCommandOfficial] + # Corvax-Contraband-end - type: Pda id: CentcomIDCard penSlot: @@ -1005,6 +1065,12 @@ id: DeathsquadPDA suffix: Death Squad components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [DeathSquad] + # Corvax-Contraband-end - type: Pda id: CentcomIDCardDeathsquad - type: Tag # Ignore Chameleon tags @@ -1017,6 +1083,12 @@ name: musician PDA description: It fills you with inspiration. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [Musician] + # Corvax-Contraband-end - type: Pda id: MusicianIDCard - type: Appearance @@ -1046,7 +1118,7 @@ - DoorBumpOpener - type: entity - parent: BasePDA + parent: [BaseCorvaxContraband431JobsAtmosphericTechnician, BasePDA] # Corvax-Contraband id: AtmosPDA name: atmos PDA description: Still smells like plasma. @@ -1178,6 +1250,12 @@ suffix: Leader description: Red for firepower. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [ERTLeader] + # Corvax-Contraband-end - type: Pda id: ERTLeaderIDCard - type: Appearance @@ -1221,6 +1299,12 @@ suffix: Engineer description: Red for firepower, it's well-worn. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [ERTEngineer] + # Corvax-Contraband-end - type: Pda id: ERTEngineerIDCard @@ -1231,6 +1315,12 @@ suffix: Janitor description: Red for firepower, it's squeaky clean. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [ERTJanitor] + # Corvax-Contraband-end - type: Pda id: ERTJanitorIDCard @@ -1241,6 +1331,12 @@ suffix: Medic description: Red for firepower, it's shiny and sterile. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [ERTMedical] + # Corvax-Contraband-end - type: Pda id: ERTMedicIDCard @@ -1251,6 +1347,12 @@ suffix: Security description: Red for firepower, it has tally marks etched on the side. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [ERTSecurity] + # Corvax-Contraband-end - type: Pda id: ERTSecurityIDCard @@ -1260,6 +1362,12 @@ name: CBURN PDA description: Smells like rotten flesh. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [CBURN] + # Corvax-Contraband-end - type: Pda id: CBURNIDcard - type: PdaBorderColor @@ -1273,6 +1381,12 @@ name: psychologist PDA description: Looks immaculately cleaned. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [Psychologist] + # Corvax-Contraband-end - type: Pda id: PsychologistIDCard - type: Appearance @@ -1292,6 +1406,12 @@ name: tram driver PDA description: A serious driver will always arrive on time. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [TramDriver] + # Corvax-Contraband-end - type: Pda id: TramDriverIDCard - type: Appearance @@ -1311,6 +1431,12 @@ name: reporter PDA description: Smells like freshly printed press. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [Reporter] + # Corvax-Contraband-end - type: Pda id: ReporterIDCard penSlot: @@ -1367,7 +1493,7 @@ state: pda-boxer - type: entity - parent: BaseSecurityPDA + parent: [BaseCorvaxContraband431JobsDetective, BaseSecurityPDA] # Corvax-Contraband id: DetectivePDA name: detective PDA description: Smells like rain... pouring down the rooftops... @@ -1395,7 +1521,7 @@ - id: LogProbeCartridge - type: entity - parent: BaseMedicalPDA + parent: [BaseCorvaxContraband431JobsBrigmedic, BaseMedicalPDA] # Corvax-Contraband id: BrigmedicPDA name: brigmedic PDA description: I wonder whose pulse is on the screen? I hope it doesn't stop... @@ -1452,7 +1578,7 @@ - type: Unremoveable - type: entity - parent: BasePDA + parent: [BaseCorvaxContraband431JobsSeniorEngineerStationEngineer, BasePDA] # Corvax-Contraband id: SeniorEngineerPDA name: senior engineer PDA description: Seems to have been taken apart and put back together several times. @@ -1476,6 +1602,12 @@ name: senior researcher PDA description: Looks like it's been through years of chemical burns and explosions. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [SeniorResearcher] + # Corvax-Contraband-end - type: Pda id: SeniorResearcherIDCard - type: Appearance @@ -1496,6 +1628,12 @@ name: senior physician PDA description: Smells faintly like iron and chemicals. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [SeniorPhysician] + # Corvax-Contraband-end - type: Pda id: SeniorPhysicianIDCard - type: Appearance @@ -1516,6 +1654,12 @@ name: senior officer PDA description: Beaten, battered and broken, but just barely useable. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [SeniorOfficer] + # Corvax-Contraband-end - type: Pda id: SeniorOfficerIDCard - type: Appearance @@ -1530,7 +1674,7 @@ state: pda-seniorofficer - type: entity - parent: BasePDA + parent: [BaseCorvaxContraband431JobsCargoTechnician, BasePDA] # Corvax-Contraband id: SeniorCourierPDA name: senior courier PDA description: Smells like postage stamps and shuttle fuel. diff --git a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml index dab46a418b..d8adbe2781 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml @@ -55,7 +55,7 @@ - type: entity name: pinpointer id: PinpointerNuclear - parent: [ PinpointerBase, BaseCommandContraband ] + parent: [BaseCorvaxContraband433DepartmentsCommand, PinpointerBase, BaseCommandContraband] # Corvax-Contraband components: - type: Pinpointer component: NukeDisk diff --git a/Resources/Prototypes/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/Entities/Objects/Devices/radio.yml index adf094d12e..31fa84770c 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/radio.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/radio.yml @@ -28,7 +28,7 @@ - type: entity name: security radio description: A handy security radio. - parent: [ RadioHandheld, BaseSecurityContraband ] + parent: [BaseCorvaxContraband433DepartmentsCommandSecurity, RadioHandheld, BaseSecurityContraband] # Corvax-Contraband id: RadioHandheldSecurity components: - type: RadioMicrophone diff --git a/Resources/Prototypes/Entities/Objects/Fun/darts.yml b/Resources/Prototypes/Entities/Objects/Fun/darts.yml index 7ed61ac896..0e12606ff1 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/darts.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/darts.yml @@ -186,7 +186,7 @@ acts: [ "Destruction" ] - type: entity - parent: [ BaseItem, BaseSyndicateContraband ] + parent: BaseItem # Corvax-Contraband: the hypodart case also conceals its properties. id: HypoDartBox name: hypodart box suffix: HypoDart diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml index ee61d4a783..b3c29823ea 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml @@ -111,7 +111,7 @@ - state: base-inhand-right - type: entity - parent: [ PersonalAI, BaseSyndicateContraband] + parent: PersonalAI # Corvax-Contraband: do not inherit a marker for hidden properties. id: SyndicatePersonalAI name: syndicate personal ai device description: Your Syndicate pal who's fun to be with! diff --git a/Resources/Prototypes/Entities/Objects/Magic/books.yml b/Resources/Prototypes/Entities/Objects/Magic/books.yml index 6ab0412840..6dc8befd61 100644 --- a/Resources/Prototypes/Entities/Objects/Magic/books.yml +++ b/Resources/Prototypes/Entities/Objects/Magic/books.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: [ BaseItem, BaseMagicalContraband ] + parent: BaseItem # Corvax-Contraband: do not inherit a marker for hidden properties. id: BaseSpellbook name: spellbook components: @@ -22,7 +22,7 @@ # For the Wizard antagonist # Do not add discounts or price inflation - type: entity - parent: [ BaseItem, StorePresetSpellbook, BaseMagicalContraband ] + parent: [BaseItem, StorePresetSpellbook] # Corvax-Contraband: do not inherit a marker for hidden properties. id: WizardsGrimoire name: wizard's grimoire suffix: Wizard diff --git a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml index 8e5d09645d..19e141df4e 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, BaseSyndicateContraband ] + parent: BedsheetBase # Corvax-Contraband 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 1748c0e19e..8f4b431d78 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, BaseSyndicateContraband ] + parent: [BaseCorvaxContraband131, Paper, BaseSyndicateContraband] # Corvax-Contraband 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/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml index ee796f1d76..2e3788563f 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml @@ -2,7 +2,7 @@ name: handcuffs description: Used to detain criminals and other assholes. id: Handcuffs - parent: [BaseItem, BaseSecurityCommandContraband] + parent: [BaseCorvaxContraband432DepartmentsSecurity, BaseItem, BaseSecurityCommandContraband] # Corvax-Contraband components: - type: Item size: Small diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index a9bb001c1f..44ad22ba46 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -1013,7 +1013,7 @@ - NuclearOperative - type: entity - parent: [ IDCardStandard, BaseSyndicateContraband ] + parent: IDCardStandard # Corvax-Contraband id: SyndicateIDCard name: syndicate ID card components: diff --git a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml index 94cc143dcf..a62da58f03 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml @@ -220,7 +220,7 @@ - type: entity id: UplinkImplanter name: uplink implanter - parent: BaseImplantOnlyImplanterSyndi + parent: [BaseCorvaxContraband436, BaseImplantOnlyImplanterSyndi] # Corvax-Contraband components: - type: Implanter implant: UplinkImplant diff --git a/Resources/Prototypes/Entities/Objects/Misc/improvised_gun_parts.yml b/Resources/Prototypes/Entities/Objects/Misc/improvised_gun_parts.yml index 12c6e1f4fe..bb69c99d66 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/improvised_gun_parts.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/improvised_gun_parts.yml @@ -1,7 +1,7 @@ #The entire game mysteriously shits itself and dies if you uncomment the item size. I have no idea why. #TODO: Assimilate these into the same RSI. - type: entity - parent: BaseItem + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseItem] # Corvax-Contraband id: ModularReceiver name: modular receiver description: A vital part used in the creation of firearms. #Could use a better description, but I'm not a gun nut so I can't really do that. @@ -18,7 +18,7 @@ - Metal - type: entity - parent: BaseItem + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseItem] # Corvax-Contraband id: RifleStock name: rifle stock description: A robust wooden stock, used in the creation of firearms. #Same as above diff --git a/Resources/Prototypes/Entities/Objects/Misc/pen.yml b/Resources/Prototypes/Entities/Objects/Misc/pen.yml index f2a16ec0d3..435580ef83 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/pen.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/pen.yml @@ -99,6 +99,12 @@ id: CyberPen description: A high-tech pen straight from Cybersun's legal department, capable of refracting hard-light at impossible angles through its diamond tip in order to write. So powerful, it's even able to rewrite officially stamped documents should the need arise. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax432 + allowedDepartments: [] + allowedJobs: [] + # Corvax-Contraband-end - type: Sprite state: overpriced_pen - type: Item @@ -112,6 +118,12 @@ id: PenCentcom description: In an attempt to keep up with the "power" of the cybersun bureaucracy, NT made a replica of cyber pen, in their corporate style. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax432 + allowedDepartments: [CentralCommand] + allowedJobs: [Magistrate, IAA] + # Corvax-Contraband-end - type: Sprite state: pen_centcom - type: Item diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml index 5cb593ffb7..e29fdf56d4 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml @@ -347,7 +347,7 @@ - type: entity name: syndicate rubber stamp - parent: [RubberStampBase, BaseSyndicateContraband] + parent: [BaseCorvaxContraband131, RubberStampBase, BaseSyndicateContraband] # Corvax-Contraband id: RubberStampSyndicate categories: [ DoNotMap ] components: diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml index d0a9602ac8..893917a0f2 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml @@ -94,7 +94,7 @@ #Traitor implants - type: entity - parent: BaseSubdermalImplant + parent: [BaseCorvaxContraband435, BaseSubdermalImplant] # Corvax-Contraband id: StorageImplant name: storage implant description: This implant grants hidden storage within a person's body using bluespace technology. @@ -122,7 +122,7 @@ type: StorageBoundUserInterface - type: entity - parent: BaseSubdermalImplant + parent: [BaseCorvaxContraband435, BaseSubdermalImplant] # Corvax-Contraband id: FreedomImplant name: freedom implant description: This implant lets the user break out of hand restraints up to three times before ceasing to function anymore. @@ -138,7 +138,7 @@ targetUser: true - type: entity - parent: BaseSubdermalImplant + parent: [BaseCorvaxContraband435, BaseSubdermalImplant] # Corvax-Contraband id: RadioImplant name: radio implant description: This implant grants access to the Syndicate channel without a headset. @@ -150,7 +150,7 @@ - Syndicate - type: entity - parent: BaseSubdermalImplant + parent: [BaseCorvaxContraband436, BaseSubdermalImplant] # Corvax-Contraband id: UplinkImplant name: uplink implant description: This implant lets the user access a hidden Syndicate uplink at will. @@ -168,7 +168,7 @@ type: StoreBoundUserInterface - type: entity - parent: BaseSubdermalImplant + parent: [BaseCorvaxContraband435, BaseSubdermalImplant] # Corvax-Contraband id: EmpImplant name: EMP implant description: This implant creates an electromagnetic pulse when activated. @@ -183,7 +183,7 @@ disableDuration: 10 - type: entity - parent: BaseSubdermalImplant + parent: [BaseCorvaxContraband435, BaseSubdermalImplant] # Corvax-Contraband id: ScramImplant name: scram implant description: This implant randomly teleports the user within a large radius when activated. @@ -196,7 +196,7 @@ targetUser: true - type: entity - parent: BaseSubdermalImplant + parent: [BaseCorvaxContraband435, BaseSubdermalImplant] # Corvax-Contraband id: DnaScramblerImplant name: DNA scrambler implant description: This implant lets the user randomly change their appearance and name once. @@ -249,7 +249,7 @@ #Nuclear Operative/Special Exclusive implants - type: entity - parent: BaseSubdermalImplant + parent: [BaseCorvaxContraband435, BaseSubdermalImplant] # Corvax-Contraband id: MicroBombImplant name: micro-bomb implant description: This implant detonates the user upon activation or upon death. @@ -358,7 +358,7 @@ targetUser: true - type: entity - parent: BaseSubdermalImplant + parent: [BaseCorvaxContraband435, BaseSubdermalImplant] # Corvax-Contraband id: FakeMindShieldImplant name: fake mindshield implant description: This implant allows the implanter to produce a fake signal that NT security huds use to identify individuals implanted with a mindshield. diff --git a/Resources/Prototypes/Entities/Objects/Power/powersink.yml b/Resources/Prototypes/Entities/Objects/Power/powersink.yml index 0394128b07..117832dc77 100644 --- a/Resources/Prototypes/Entities/Objects/Power/powersink.yml +++ b/Resources/Prototypes/Entities/Objects/Power/powersink.yml @@ -1,6 +1,6 @@ - type: entity id: PowerSink - parent: [BaseMachine, BaseSyndicateContraband, BaseMachineDestructible] + parent: [BaseCorvaxContraband436, BaseMachine, BaseSyndicateContraband, BaseMachineDestructible] # Corvax-Contraband name: power sink description: Drains immense amounts of electricity from the grid. components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml index ab458a6003..d494a2020f 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml @@ -62,7 +62,7 @@ stealGroup: Bible - type: entity - parent: [Bible, BaseSyndicateContraband] + parent: Bible # Corvax-Contraband: do not inherit a marker for hidden properties. name: necronomicon description: "There's a note: Klatuu, Verata, Nikto -- Don't forget it again!" id: BibleNecronomicon diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml index 3dfc0ed103..24ee5b26a6 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml @@ -3,7 +3,7 @@ - type: entity name: cannabis leaves - parent: ProduceBaseRuminant + parent: [BaseCorvaxContraband432JobsBotanist, ProduceBaseRuminant] # Corvax-Contraband id: LeavesCannabis description: "Recently legalized in most galaxies." components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index 4e975b33cb..4738a4afee 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -514,7 +514,7 @@ sprite: Objects/Specific/Hydroponics/fly_amanita.rsi - type: entity - parent: [SeedBase, BaseSyndicateContraband] + parent: SeedBase # Corvax-Contraband: do not inherit a marker for hidden properties. name: packet of gatfruit seeds description: "These are no peashooters." id: GatfruitSeeds diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml index b8c1bbf6bb..eda26745f0 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml @@ -1,6 +1,6 @@ - type: entity name: mini hoe - parent: BaseItem + parent: [BaseCorvaxContraband432JobsBotanist, BaseItem] # Corvax-Contraband id: HydroponicsToolMiniHoe description: It's used for removing weeds or scratching your back. components: @@ -28,7 +28,7 @@ - type: entity name: plant clippers - parent: BaseItem + parent: [BaseCorvaxContraband432JobsBotanist, BaseItem] # Corvax-Contraband id: HydroponicsToolClippers description: A tool used to take samples from plants. components: @@ -53,7 +53,7 @@ - type: entity name: scythe - parent: BaseItem + parent: [BaseCorvaxContraband432JobsBotanist, BaseItem] # Corvax-Contraband id: HydroponicsToolScythe description: A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow. components: @@ -83,7 +83,7 @@ - type: entity name: hatchet - parent: BaseItem + parent: [BaseCorvaxContraband432JobsBotanist, BaseItem] # Corvax-Contraband id: HydroponicsToolHatchet description: A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood. components: @@ -115,7 +115,7 @@ - type: entity name: spade - parent: BaseItem + parent: [BaseCorvaxContraband432JobsBotanist, BaseItem] # Corvax-Contraband id: HydroponicsToolSpade description: A small tool for digging and moving dirt. components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml index c258cd8580..3a4523032c 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml @@ -127,7 +127,7 @@ residueColor: residue-brown - type: entity - parent: [Soap, BaseSyndicateContraband] + parent: [BaseCorvaxContraband131, Soap, BaseSyndicateContraband] # Corvax-Contraband id: SoapSyndie description: An untrustworthy bar of soap. Smells of fear. components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml index fae0a8b7fd..1e736ef457 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml @@ -121,6 +121,12 @@ name: Ripley APLU description: Versatile and lightly armored, the Ripley is useful for almost any heavy work scenario. The "APLU" stands for Autonomous Power Loading Unit. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax431 + allowedDepartments: [Cargo] + allowedJobs: [] + # Corvax-Contraband-end - type: Sprite drawdepth: Mobs noRot: true diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml index c59c590a87..8d547ba3d1 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml @@ -98,7 +98,7 @@ - type: entity id: DefibrillatorSyndicate - parent: [ DefibrillatorCompact, BaseSyndicateContraband ] + parent: [BaseCorvaxContraband131, DefibrillatorCompact, BaseSyndicateContraband] # Corvax-Contraband name: interdyne defibrillator description: Doubles as a self-defense weapon against war-crime inclined tiders. components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml index 63cb737cc2..07a8f90f15 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml @@ -17,7 +17,7 @@ - type: entity name: cautery id: Cautery - parent: BaseToolSurgery + parent: [BaseCorvaxContraband432DepartmentsMedical, BaseToolSurgery] # Corvax-Contraband description: A surgical tool used to cauterize open wounds. components: - type: Sprite @@ -38,7 +38,7 @@ - type: entity name: drill id: Drill - parent: BaseToolSurgery + parent: [BaseCorvaxContraband432DepartmentsMedical, BaseToolSurgery] # Corvax-Contraband description: A surgical drill for making holes into hard material. components: - type: Sprite @@ -63,7 +63,7 @@ - type: entity name: scalpel id: Scalpel - parent: BaseToolSurgery + parent: [BaseCorvaxContraband432DepartmentsMedical, BaseToolSurgery] # Corvax-Contraband description: A surgical tool used to make incisions into flesh. components: - type: Tool @@ -142,7 +142,7 @@ - type: entity name: retractor id: Retractor - parent: BaseToolSurgery + parent: [BaseCorvaxContraband432DepartmentsMedical, BaseToolSurgery] # Corvax-Contraband description: A surgical tool used to hold open incisions. components: - type: Sprite @@ -175,7 +175,7 @@ - type: entity name: metal saw id: Saw - parent: BaseToolSurgery + parent: [BaseCorvaxContraband432DepartmentsMedical, BaseToolSurgery] # Corvax-Contraband description: For cutting wood and other objects to pieces. Or sawing bones, in case of emergency. components: - type: Utensil diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml index d6bfbd6eb7..2d14135da4 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml @@ -122,7 +122,7 @@ - type: entity id: AnomalyLocator - parent: [ AnomalyLocatorUnpowered, PowerCellSlotSmallItem ] + parent: [BaseCorvaxContraband432DepartmentsScience, AnomalyLocatorUnpowered, PowerCellSlotSmallItem] # Corvax-Contraband suffix: "" components: - type: PowerCellDraw @@ -157,7 +157,7 @@ - type: entity id: AnomalyLocatorWide - parent: [ AnomalyLocatorWideUnpowered, PowerCellSlotSmallItem ] + parent: [BaseCorvaxContraband432DepartmentsScience, AnomalyLocatorWideUnpowered, PowerCellSlotSmallItem] # Corvax-Contraband suffix: "" components: - type: PowerCellDraw diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_xenoartifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_xenoartifacts.yml index ea6a16482c..236e6d4b20 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_xenoartifacts.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_xenoartifacts.yml @@ -71,7 +71,7 @@ isGenerationRequired: false - type: entity - parent: BaseXenoArtifactItem + parent: [BaseCorvaxContraband434DepartmentsScience, BaseXenoArtifactItem] # Corvax-Contraband id: ComplexXenoArtifactItem suffix: Hand-Sized components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/node_scanner.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/node_scanner.yml index 21abf45cae..cf0674eb6a 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/node_scanner.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/node_scanner.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseItem + parent: [BaseCorvaxContraband431DepartmentsScience, BaseItem] # Corvax-Contraband id: NodeScanner name: node scanner description: The archeologist's friend, able to identify the node of an artifact with only a single scan. diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_xenoartifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_xenoartifacts.yml index 49f33b2cd6..8d3da16010 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_xenoartifacts.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_xenoartifacts.yml @@ -50,7 +50,7 @@ isGenerationRequired: false - type: entity - parent: BaseXenoArtifactStructure + parent: [BaseCorvaxContraband434DepartmentsScience, BaseXenoArtifactStructure] # Corvax-Contraband id: ComplexXenoArtifact components: - type: XenoArtifact diff --git a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml index c3b48a4a46..0aea649cef 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml @@ -1,7 +1,7 @@ - type: entity name: telecrystal - parent: [BaseItem, BaseSyndicateContraband] + parent: BaseItem # Corvax-Contraband: do not inherit a marker for hidden properties. id: Telecrystal suffix: 20 TC description: It seems to be pulsing with suspiciously enticing energies. @@ -49,7 +49,7 @@ # Uplinks - type: entity - parent: [BaseItem, StorePresetUplink, BaseSyndicateContraband] + parent: [BaseCorvaxContraband436, BaseItem, StorePresetUplink, BaseSyndicateContraband] # Corvax-Contraband id: BaseUplinkRadio name: syndicate uplink description: Suspiciously looking old radio... diff --git a/Resources/Prototypes/Entities/Objects/Tools/decoys.yml b/Resources/Prototypes/Entities/Objects/Tools/decoys.yml index 4e1153e8f8..c4d436ce3f 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/decoys.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/decoys.yml @@ -65,7 +65,7 @@ - Flashlight - type: entity - parent: BaseDecoy + parent: [BaseCorvaxContraband131, BaseDecoy] # Corvax-Contraband id: BalloonOperative name: operative balloon description: Upon closer inspection, this Syndicate operative is actually a balloon. diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml index eb0f6965cc..47ab5acc60 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml @@ -1,6 +1,6 @@ - type: entity name: jaws of life - parent: BaseItem + parent: [BaseCorvaxContraband431DepartmentsEngineering, BaseItem] # Corvax-Contraband id: JawsOfLife description: A set of jaws of life, compressed through the magic of science. components: diff --git a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml index 93a0f927e1..8faf76a892 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml @@ -70,7 +70,7 @@ - Flashlight - type: entity - parent: Lantern + parent: [BaseCorvaxContraband432DepartmentsSecurity, Lantern] # Corvax-Contraband id: LanternFlash suffix: Flash components: diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml index 7bf912517c..b48d9a6509 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml @@ -278,7 +278,7 @@ stealGroup: FlippoEngravedLighter - type: entity - parent: [BaseBrandedLighter, BaseSyndicateContraband] + parent: [BaseCorvaxContraband131, BaseBrandedLighter, BaseSyndicateContraband] # Corvax-Contraband id: SyndicateFlippo name: Blood-red flippo description: "A 'Valid' choice in lighters. Contains no copper." @@ -291,7 +291,7 @@ color: green - type: entity - parent: [BaseBrandedLighter, BaseSyndicateContraband] + parent: [BaseCorvaxContraband131, BaseBrandedLighter, BaseSyndicateContraband] # Corvax-Contraband id: CybersunFlippo name: CyberSun Flippo description: A sleek black and magenta flippo lighter, bearing the logo and iconography of CyberSun Industries. @@ -304,7 +304,7 @@ color: magenta - type: entity - parent: [BaseBrandedLighter, BaseSyndicateContraband] + parent: [BaseCorvaxContraband131, BaseBrandedLighter, BaseSyndicateContraband] # Corvax-Contraband id: InterdyneFlippo name: Interdyne Flippo description: "A deep blue flippo lighter, decorated with the logo of Interdyne Pharmaceuticals' 'Gene Clean' clinics. Become the master of your own cigarette." diff --git a/Resources/Prototypes/Entities/Objects/Tools/thief.yml b/Resources/Prototypes/Entities/Objects/Tools/thief.yml index 7200c8c06d..a3d27978b8 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/thief.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/thief.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseMinorContraband + # Corvax-Contraband: removed the contraband-only parent for this disguised item. id: ThiefBeacon name: thieving beacon description: A device that will teleport everything around it to the thief's vault at the end of the shift. @@ -69,7 +69,7 @@ id: SatchelThief name: undetermined thieving satchel description: This is where your favorite thief's supplies lie. Folded for your convenience. - parent: ToolboxThief + parent: [BaseCorvaxContraband436, ToolboxThief] # Corvax-Contraband components: - type: Sprite sprite: Clothing/Back/Satchels/smuggler.rsi diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index 5372dfde74..204a93571c 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -240,7 +240,7 @@ #Later on these should switch probably switch damage when changing the tool behavior. - type: entity name: power drill - parent: BaseItem + parent: [BaseCorvaxContraband431DepartmentsEngineering, BaseItem] # Corvax-Contraband id: PowerDrill description: A simple powered hand drill. components: @@ -309,6 +309,12 @@ name: RCD description: The rapid construction device can be used to quickly place and remove various station structures and fixtures. Requires compressed matter to function. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax432 + allowedDepartments: [Engineering] + allowedJobs: [] + # Corvax-Contraband-end - type: RCD availablePrototypes: - WallSolid diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml index 3036e97419..96797f41d1 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml @@ -158,7 +158,7 @@ - type: entity name: experimental welding tool - parent: [SolutionToolWelderExperimental, BaseWelder] + parent: [BaseCorvaxContraband431DepartmentsEngineering, SolutionToolWelderExperimental, BaseWelder] # Corvax-Contraband id: WelderExperimental description: "An experimental welder capable of self-fuel generation and less harmful to the eyes." components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml index f59a74467a..667df256c0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml @@ -1,7 +1,7 @@ - type: entity name: hot potato description: Once activated, you can't drop this time bomb - hit someone else with it to save yourself! Don't burn your hands! - parent: [BaseItem, BaseSyndicateContraband] + parent: BaseItem # Corvax-Contraband: do not inherit a marker for hidden properties. id: HotPotato components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml index cca6f139e1..e29040cc1f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml @@ -71,7 +71,7 @@ ## Plastic Explosives used in game - type: entity - parent: [BasePlasticExplosive, BaseSyndicateContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BasePlasticExplosive, BaseSyndicateContraband] # Corvax-Contraband id: C4 name: composition C-4 description: Used to put holes in specific areas without too much extra hole. A saboteur's favorite. 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 825f375510..f0550e91bd 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, BaseSecurityContraband ] + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseItem, BaseSecurityContraband] # Corvax-Contraband id: BaseMagazineBoxAntiMateriel name: ammunition box (.60 anti-materiel) components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml index 47e961bae0..241b7a7552 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: BaseItem + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseItem] # Corvax-Contraband id: BaseMagazineBoxCaselessRifle name: ammunition box (.25 caseless) components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml index bead9dff0b..828c42cd0c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: BaseItem + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseItem] # Corvax-Contraband id: BaseMagazineBoxLightRifle name: ammunition box (.30 rifle) components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml index af61bb9379..b81344c169 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: BaseItem + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseItem] # Corvax-Contraband id: BaseMagazineBoxMagnum components: - type: BallisticAmmoProvider diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml index f359589177..90d11290ce 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: BaseItem + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseItem] # Corvax-Contraband id: BaseMagazineBoxPistol name: ammunition box (.35 auto) components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml index e079da2931..93c46f8794 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: BaseItem + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseItem] # Corvax-Contraband id: BaseMagazineBoxRifle components: - type: BallisticAmmoProvider diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml index 6fe89e2684..5dea18acfb 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: [ BaseCartridge, BaseSecurityContraband ] + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseCartridge, BaseSecurityContraband] # Corvax-Contraband id: BaseCartridgeCaselessRifle name: cartridge (.25 caseless) components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml index 1a9822d4f4..bdee2836ff 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: [ BaseCartridge, BaseSecurityContraband ] + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseCartridge, BaseSecurityContraband] # Corvax-Contraband id: BaseCartridgeHeavyRifle name: cartridge (.10 rifle) components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml index f3f578f56f..5dba225659 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: [ BaseCartridge, BaseSecurityContraband ] + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseCartridge, BaseSecurityContraband] # Corvax-Contraband id: BaseCartridgeLightRifle name: cartridge (.30 rifle) components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml index 7c28aa52bc..393e9a35a3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: [ BaseCartridge, BaseSecurityContraband ] + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseCartridge, BaseSecurityContraband] # Corvax-Contraband id: BaseCartridgeMagnum name: cartridge (.45 magnum) components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml index 64bda7299b..b2fa7c91bf 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: [ BaseCartridge, BaseSecurityContraband ] + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseCartridge, BaseSecurityContraband] # Corvax-Contraband id: BaseCartridgePistol name: cartridge (.35 auto) components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml index d39f907fb0..c9521c8cea 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: [ BaseCartridge, BaseSecurityContraband ] + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseCartridge, BaseSecurityContraband] # Corvax-Contraband id: BaseCartridgeRifle name: cartridge (.20 rifle) components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml index e02400e892..5342cdd666 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: BaseCartridge + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseCartridge] # Corvax-Contraband id: BaseShellShotgun name: shell (.50) components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml index 02468697db..aef58ad7d2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: [ BaseItem, BaseSecurityContraband ] + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseItem, BaseSecurityContraband] # Corvax-Contraband id: BaseMagazinePistolCaselessRifle name: "pistol magazine (.25 caseless)" components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml index 805bde0484..ea20582d8a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml @@ -1,7 +1,7 @@ # Empty mags - type: entity abstract: true - parent: [ BaseItem, BaseSecurityContraband ] + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseItem, BaseSecurityContraband] # Corvax-Contraband id: BaseMagazineLightRifle name: "magazine (.30 rifle)" components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index 5437e4a200..9eb3e1900d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: [ BaseItem, BaseSecurityContraband ] + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseItem, BaseSecurityContraband] # Corvax-Contraband id: BaseMagazinePistol name: pistol magazine (.35 auto) components: @@ -33,7 +33,7 @@ - type: entity abstract: true - parent: [ BaseItem, BaseSecurityContraband ] + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseItem, BaseSecurityContraband] # Corvax-Contraband id: BaseMagazinePistolHighCapacity name: machine pistol magazine (.35 auto) components: @@ -66,7 +66,7 @@ - type: entity abstract: true - parent: [ BaseItem, BaseSecurityContraband ] + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseItem, BaseSecurityContraband] # Corvax-Contraband id: BaseMagazinePistolSubMachineGun # Yeah it's weird but it's pistol caliber name: SMG magazine (.35 auto) components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml index 99accaa558..dfe76d5bcf 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: [ BaseItem, BaseSecurityContraband ] + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseItem, BaseSecurityContraband] # Corvax-Contraband id: BaseMagazineRifle name: "magazine (.20 rifle)" components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml index 3d05cc4608..5a03123d7a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: [ BaseItem, BaseSecurityContraband ] + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseItem, BaseSecurityContraband] # Corvax-Contraband id: BaseMagazineShotgun name: ammo drum (.50 shells) components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml index de06bc064b..2cded410a0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: [ BaseItem, BaseSecurityContraband ] + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseItem, BaseSecurityContraband] # Corvax-Contraband id: BaseSpeedLoaderMagnum name: "speed loader (.45 magnum)" components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml index 681bf4ff8c..ca744da2c7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml @@ -1,7 +1,7 @@ - type: entity id: WeaponStaffBase abstract: true - parent: [ BaseItem, BaseMagicalContraband ] + parent: BaseItem # Corvax-Contraband: do not inherit a marker for hidden properties. components: - type: Sprite sprite: Objects/Weapons/Guns/Basic/staves.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/energy_crossbow.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/energy_crossbow.yml index 40b7f7adf8..a63cba3da1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/energy_crossbow.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/energy_crossbow.yml @@ -35,7 +35,7 @@ count: 1 - type: entity - parent: [WeaponEnergyCrossbowBase, BaseSyndicateContraband] + parent: WeaponEnergyCrossbowBase # Corvax-Contraband: do not inherit a marker for hidden properties. id: WeaponEnergyCrossbow name: mini energy crossbow description: Launches renewable toxic arrows capable of flooring targets instantly. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml index 9bf6268147..becdb62dbb 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml @@ -1,7 +1,7 @@ - type: entity name: proto-kinetic accelerator id: WeaponProtoKineticAccelerator - parent: [WeaponProtoKineticAcceleratorBase, BaseCargoContraband] + parent: [BaseCorvaxContraband432DepartmentsCargo, WeaponProtoKineticAcceleratorBase, BaseCargoContraband] # Corvax-Contraband description: Fires low-damage kinetic bolts at a short range. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 30f3375781..a71a75f0cc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -144,7 +144,7 @@ - type: entity name: svalinn laser pistol - parent: [BaseWeaponPowerCellSmall, BaseSecurityContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponPowerCellSmall, BaseSecurityContraband] # Corvax-Contraband id: WeaponLaserSvalinn description: A cheap and widely used laser pistol. components: @@ -173,7 +173,7 @@ - type: entity name: retro laser blaster - parent: [BaseWeaponBatterySmall, BaseMajorContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponBatterySmall, BaseMajorContraband] # Corvax-Contraband id: WeaponLaserGun description: A weapon using light amplified by the stimulated emission of radiation. components: @@ -202,7 +202,7 @@ - type: entity name: makeshift laser pistol - parent: [BaseWeaponBatterySmall, BaseMinorContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponBatterySmall, BaseMinorContraband] # Corvax-Contraband id: WeaponMakeshiftLaser description: Better pray it won't burn your hands off. components: @@ -236,7 +236,7 @@ - type: entity name: tesla gun - parent: [BaseWeaponBattery, BaseMajorContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponBattery, BaseMajorContraband] # Corvax-Contraband id: WeaponTeslaGun description: The power of the primordial element of lightning in your hands. components: @@ -269,7 +269,7 @@ - type: entity name: laser carbine - parent: [BaseLaserRifle, BaseGunWieldable, BaseSecurityContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseLaserRifle, BaseGunWieldable, BaseSecurityContraband] # Corvax-Contraband id: WeaponLaserCarbine description: Favoured by Nanotrasen Security for being cheap and easy to use. @@ -288,7 +288,7 @@ - type: entity name: pulse pistol - parent: [BaseWeaponBatterySmall, BaseCentcommContraband] + parent: [BaseCorvaxContraband434DepartmentsCentralCommand, BaseWeaponBatterySmall, BaseCentcommContraband] # Corvax-Contraband id: WeaponPulsePistol description: A state of the art energy pistol favoured as a sidearm by the NT operatives. components: @@ -328,7 +328,7 @@ - type: entity name: pulse carbine - parent: [BaseWeaponBattery, BaseGunWieldable, BaseCentcommContraband] + parent: [BaseCorvaxContraband434DepartmentsCentralCommand, BaseWeaponBattery, BaseGunWieldable, BaseCentcommContraband] # Corvax-Contraband id: WeaponPulseCarbine description: A high tech energy carbine favoured by the NT-ERT operatives. components: @@ -366,7 +366,7 @@ - type: entity name: pulse rifle - parent: [BaseWeaponBattery, BaseGunWieldable, BaseCentcommContraband] + parent: [BaseCorvaxContraband434DepartmentsCentralCommand, BaseWeaponBattery, BaseGunWieldable, BaseCentcommContraband] # Corvax-Contraband id: WeaponPulseRifle description: A weapon that is almost as infamous as its users. components: @@ -402,7 +402,7 @@ - type: entity name: laser cannon - parent: [BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband] # Corvax-Contraband id: WeaponLaserCannon description: A heavy duty, high powered laser weapon. components: @@ -471,7 +471,7 @@ - type: entity name: x-ray cannon - parent: [BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband] # Corvax-Contraband id: WeaponXrayCannon description: An experimental weapon that uses concentrated x-ray energy against its target. components: @@ -545,7 +545,7 @@ - type: entity name: disabler - parent: [WeaponDisablerPractice, BaseSecurityCommandContraband] + parent: [BaseCorvaxContraband432DepartmentsSecurity, WeaponDisablerPractice, BaseSecurityCommandContraband] # Corvax-Contraband id: WeaponDisabler description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. components: @@ -574,7 +574,7 @@ - type: entity name: disabler SMG - parent: [BaseWeaponBattery, BaseSecurityContraband] + parent: [BaseCorvaxContraband432DepartmentsSecurity, BaseWeaponBattery, BaseSecurityContraband] # Corvax-Contraband id: WeaponDisablerSMG description: Advanced weapon that exhausts organic targets, weakening them until they collapse. components: @@ -615,7 +615,7 @@ - type: entity name: taser - parent: [BaseWeaponBatterySmall, BaseSecurityContraband] + parent: [BaseCorvaxContraband432DepartmentsSecurity, BaseWeaponBatterySmall, BaseSecurityContraband] # Corvax-Contraband id: WeaponTaser description: A low-capacity, energy-based stun gun used by security teams to subdue targets at close range. components: @@ -715,7 +715,7 @@ - type: entity name: advanced laser pistol - parent: [BaseWeaponBatterySmall, BaseSecurityContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponBatterySmall, BaseSecurityContraband] # Corvax-Contraband id: WeaponAdvancedLaser description: An experimental high-energy laser pistol with a self-charging nuclear battery. components: @@ -755,7 +755,7 @@ - type: entity name: C.H.I.M.P. handcannon - parent: [BaseWeaponBatterySmall, BaseScienceContraband] + parent: [BaseCorvaxContraband432DepartmentsScience, BaseWeaponBatterySmall, BaseScienceContraband] # Corvax-Contraband id: WeaponPistolCHIMP description: Just because it's a little C.H.I.M.P. doesn't mean it can't punch like an A.P.E. components: @@ -848,7 +848,7 @@ - type: entity name: energy shotgun - parent: [BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband] # Corvax-Contraband id: WeaponEnergyShotgun description: A one-of-a-kind prototype energy weapon that uses various shotgun configurations. It offers the possibility of both lethal and non-lethal shots, making it a versatile weapon. components: @@ -939,7 +939,7 @@ - type: entity name: temperature gun - parent: [BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband] # Corvax-Contraband id: WeaponTemperatureGun description: An advanced gun that shoots body-temperature-changing beams. This probably constitutes as some kind of war crime. components: @@ -1058,7 +1058,7 @@ id: WeaponRangeFinderXenoborg name: xenoborg range finder components: - - type: Sprite + - type: Sprite sprite: Objects/Weapons/Guns/Battery/xenoborg_range_finder.rsi layers: - state: icon diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Bow/bow.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Bow/bow.yml index edb3d40803..3cf50b164b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Bow/bow.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Bow/bow.yml @@ -48,7 +48,7 @@ - type: entity id: BowImprovised - parent: BaseBow + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseBow] # Corvax-Contraband name: improvised shortbow components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml index 51171919ec..465e87780e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml @@ -29,7 +29,7 @@ - type: entity name: minigun id: WeaponMinigun - parent: [ BaseWeaponHeavyMachineGun, BaseMajorContraband ] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponHeavyMachineGun, BaseMajorContraband] # Corvax-Contraband description: Vzzzzzt! Rahrahrahrah! Vrrrrr! Uses .10 rifle ammo. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml index b499ea46b3..2959ea27fd 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -67,7 +67,7 @@ - type: entity name: L6 SAW id: WeaponLightMachineGunL6 - parent: [BaseWeaponLightMachineGun, BaseSyndicateContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponLightMachineGun, BaseSyndicateContraband] # Corvax-Contraband description: Developed by Waffle Corp, the L6 Squad Automatic Weapon is a deadly light machine gun often used by the Gorlex Marauders. Although bulky and cumbersome, its heavy barrel and high ammo capacity make it perfect for suppressing combatants with a hail of bullets. Feeds from .30 ammo belts. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 33e26ccf4e..1d79e5c809 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -64,7 +64,7 @@ price: 10000 - type: entity - parent: [ BaseWeaponLauncher, BaseMajorContraband ] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponLauncher, BaseMajorContraband] # Corvax-Contraband id: WeaponLauncherHydra name: hydra description: PLOOP... FSSSSSS... @@ -108,7 +108,7 @@ proto: GrenadeFrag - type: entity - parent: [ BaseWeaponLauncher, BaseMajorContraband ] + parent: [BaseCorvaxContraband435, BaseWeaponLauncher, BaseMajorContraband] # Corvax-Contraband id: WeaponLauncherRocket name: RPG-7 description: A modified ancient rocket-propelled grenade launcher. @@ -182,7 +182,7 @@ channel: XenoborgGuidedMissileLauncher - type: entity - parent: BaseWeaponLauncher + parent: [BaseCorvaxContraband435, BaseWeaponLauncher] # Corvax-Contraband id: WeaponLauncherMultipleRocket name: multiple rocket launcher description: A modified ancient rocket-propelled grenade launcher. @@ -260,7 +260,7 @@ - type: Appearance - type: entity - parent: BaseWeaponLauncher + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponLauncher] # Corvax-Contraband id: WeaponLauncherPirateCannon name: pirate cannon description: Kaboom! diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 226eed44b1..80210749cb 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -71,7 +71,7 @@ - type: entity name: viper - parent: [BaseWeaponPistol, BaseSyndicateContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponPistol, BaseSyndicateContraband] # Corvax-Contraband id: WeaponPistolViper description: A common handgun illegally modified by the Syndicate. The Viper sports a selector switch between semi-auto and ‘rock and roll’. The standard sidearm for any soldier who fights under the three serpents. Feeds from .35 pistol magazines. components: @@ -143,7 +143,7 @@ - type: entity name: cobra - parent: [ BaseWeaponPistol, BaseSyndicateContraband ] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponPistol, BaseSyndicateContraband] # Corvax-Contraband id: WeaponPistolCobra description: Integrally suppressed semi-automatic pistol used by the Syndicate, firing caseless subsonic rounds. Favored by any agent who likes to keep things quiet and leave no evidence behind. Feeds from .25 pistol magazines. components: @@ -193,7 +193,7 @@ - type: entity name: mk 58 - parent: [BaseWeaponPistol, BaseSecurityContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponPistol, BaseSecurityContraband] # Corvax-Contraband id: WeaponPistolMk58 description: Designed by Nanotrasen’s Small Arms Division, the Mk58 is a conventional semi-automatic pistol with a simple recoil-operated action and excellent reliability. The standard sidearm of Nanotrasen’s station security and emergency response teams. Feeds from .35 pistol magazines. components: @@ -219,7 +219,7 @@ - type: entity name: N1984 - parent: [BaseWeaponPistol, BaseSecurityContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponPistol, BaseSecurityContraband] # Corvax-Contraband id: WeaponPistolN1984 description: An exceptionally powerful ‘hand cannon’ designed as part of Nanotrasen's BFG initiative. Chambered in .45, the lord’s caliber, it is generally considered too unwieldy for standard use but has become something of a status symbol among Nanotrasen officials. Feeds from .45 pistol magazines. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 7d234d5e1e..27a8741a01 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -57,6 +57,12 @@ id: WeaponRevolverDeckard description: A beautifully machined, custom-built revolver. Used when there is no time for the Voight-Kampff test. Loads 5 rounds of .45 magnum. components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax434 + allowedDepartments: [Security, Command] + allowedJobs: [] + # Corvax-Contraband-end - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi layers: @@ -81,7 +87,7 @@ - type: entity name: Inspector - parent: [BaseWeaponRevolver, BaseSecurityContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponRevolver, BaseSecurityContraband] # Corvax-Contraband id: WeaponRevolverInspector description: A double-action revolver manufactured by various companies. It is readily available on the civilian market, making it a popular choice among private investigators. You feel lucky just holding it. Loads 6 rounds of .45 magnum. components: @@ -100,7 +106,7 @@ - type: entity name: Mateba - parent: [BaseWeaponRevolver, BaseMajorContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponRevolver, BaseMajorContraband] # Corvax-Contraband id: WeaponRevolverMateba description: A modern revolver used by Nanotrasen’s elite, near mythical ‘Death Squad’ task force. Its unique trigger action and barrel placement enable a high fire rate with minimal muzzle flip. Many have looked down this barrel, but few have lived to tell of it. Loads 6 rounds of .45 magnum. components: @@ -125,7 +131,7 @@ - type: entity name: Python - parent: [BaseWeaponRevolver, BaseSyndicateContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponRevolver, BaseSyndicateContraband] # Corvax-Contraband id: WeaponRevolverPython description: A powerful double-action revolver manufactured by the Syndicate. Loud and flashy, perfect for any agent looking to make a statement. Loads 6 rounds of .45 magnum. components: @@ -158,7 +164,7 @@ - type: entity name: pirate revolver - parent: [BaseWeaponRevolver, BaseMajorContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponRevolver, BaseMajorContraband] # Corvax-Contraband id: WeaponRevolverPirate description: A crude single-action revolver handmade by a space pirate. Old and covered in rust, it somehow still works. Loads 5 rounds of .45 magnum. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 961705ebd4..9e9d1d01cd 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -55,7 +55,7 @@ - type: entity name: AKMS - parent: [BaseWeaponRifle, BaseSecurityContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponRifle, BaseSecurityContraband] # Corvax-Contraband id: WeaponRifleAk description: A somewhat battered combat rifle of a design originating from old Earth. Favored by criminals, militias, and terrorists due to its famed reliability and easy-to-manufacture design. Feeds from .30 rifle magazines. components: @@ -102,7 +102,7 @@ - type: entity name: Lecter - parent: [BaseWeaponRifle, BaseSecurityContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponRifle, BaseSecurityContraband] # Corvax-Contraband id: WeaponRifleLecter description: "Popular gas-operated combat rifle used heavily by Nanotrasen and SolGov. Operating in semi or fully automatic, its accuracy, stopping power, and reliability make it excel in all manner of environments.\nFeeds from .20 rifle magazines." components: @@ -175,7 +175,7 @@ - type: entity name: Estoc DMR - parent: [BaseWeaponRifle, BaseSyndicateContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponRifle, BaseSyndicateContraband] # Corvax-Contraband id: WeaponRifleEstoc description: "A designated marksman rifle firing in 3-round bursts. The Estoc was designed as the Lecter’s long-range counterpart, equipped with an extended 20-inch barrel and telescopic sight.\nFeeds from .20 rifle magazines." components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index de44dfc24c..cd7dfad1af 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -61,7 +61,7 @@ - type: entity name: Atreides - parent: [BaseWeaponSubMachineGun, BaseMajorContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponSubMachineGun, BaseMajorContraband] # Corvax-Contraband id: WeaponSubMachineGunAtreides description: A rare machine pistol hailing from the Corporate Wars. Its extremely high fire rate and compact profile make it useful in close quarters combat. Despite its age, it is in remarkably good condition. Feeds from .35 SMG magazines. components: @@ -84,7 +84,7 @@ - type: entity name: C-20r submachine gun - parent: [BaseWeaponSubMachineGun, BaseSyndicateContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponSubMachineGun, BaseSyndicateContraband] # Corvax-Contraband id: WeaponSubMachineGunC20r description: A classic and widespread submachine gun, infamous for its use by the Gorlex Marauders. One of the first homegrown Waffle Corp. designs, it remains in service today. Feeds from .35 SMG magazines. components: @@ -166,7 +166,7 @@ - type: entity name: Drozd - parent: [BaseWeaponSubMachineGun, BaseSecurityContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponSubMachineGun, BaseSecurityContraband] # Corvax-Contraband id: WeaponSubMachineGunDrozd description: A modern SMG manufactured by Nanotrasen’s Small Arms Division. It features an exceptional rate of fire in burst mode, useful for holding defensive angles or engaging hostiles at longer ranges. Feeds from .35 SMG magazines. components: @@ -224,7 +224,7 @@ - type: entity name: WT550 - parent: [BaseWeaponSubMachineGun, BaseSecurityContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponSubMachineGun, BaseSecurityContraband] # Corvax-Contraband id: WeaponSubMachineGunWt550 description: A truly unique firearm, the WT550 was designed by Nanotrasen's Small Arms Division as a compact submachine gun fully controllable with one hand. It contains an exotic internal recoil buffer and feeds from special top-mounted .35 magazines. components: @@ -285,7 +285,7 @@ - type: entity name: brown briefcase - parent: [BaseWeaponSubMachineGun] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponSubMachineGun] # Corvax-Contraband id: WeaponSubMachineGunBriefcase description: Useful for carrying items in your hands. suffix: Gun diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 6e6266249f..e741861c43 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -50,7 +50,7 @@ - type: entity name: Bulldog # Don't parent to BaseWeaponShotgun because it differs significantly - parent: [BaseItem, BaseGunWieldable, BaseSyndicateContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseItem, BaseGunWieldable, BaseSyndicateContraband] # Corvax-Contraband id: WeaponShotgunBulldog description: An automatic magazine-fed shotgun for close-quarters combat. Kicks like a mule on steroids. Uses .50 shotgun shells. components: @@ -110,7 +110,7 @@ - type: entity name: double-barreled shotgun - parent: [BaseWeaponShotgun, BaseGunWieldable, BaseSecurityBartenderContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurityJobsBartender, BaseWeaponShotgun, BaseGunWieldable, BaseSecurityBartenderContraband] # Corvax-Contraband id: WeaponShotgunDoubleBarreled description: An immortal classic. Uses .50 shotgun shells. components: @@ -142,7 +142,7 @@ - type: entity name: Enforcer - parent: [BaseWeaponShotgun, BaseGunWieldable, BaseSecurityContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponShotgun, BaseGunWieldable, BaseSecurityContraband] # Corvax-Contraband id: WeaponShotgunEnforcer description: A premium semi-automatic shotgun, and the pride of all security forces. Uses .50 shotgun shells. components: # intend for Enforcer to have wider choke for semi-auto function @@ -171,7 +171,7 @@ - type: entity name: Kammerer - parent: [BaseWeaponShotgun, BaseGunWieldable, BaseSecurityContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponShotgun, BaseGunWieldable, BaseSecurityContraband] # Corvax-Contraband id: WeaponShotgunKammerer description: An old yet faithful design, and a favorite among irregular forces of many worlds. Uses .50 shotgun shells. components: # intend for Kammerer to have tighter choke for slower fire rate and/or manual cycling @@ -194,7 +194,7 @@ - type: entity name: sawn-off shotgun - parent: [ BaseWeaponShotgun, BaseSecurityBartenderContraband ] + parent: [BaseCorvaxContraband434DepartmentsSecurityJobsBartender, BaseWeaponShotgun, BaseSecurityBartenderContraband] # Corvax-Contraband id: WeaponShotgunSawn description: Groovy! Uses .50 shotgun shells. components: # needs to be super inaccurate because you don't need to wield it @@ -236,7 +236,7 @@ - type: entity name: handmade pistol - parent: [BaseWeaponShotgun, BaseMinorContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponShotgun, BaseMinorContraband] # Corvax-Contraband id: WeaponShotgunHandmade description: Looks unreliable. Uses .50 shotgun shells. components: @@ -265,7 +265,7 @@ - type: entity name: blunderbuss - parent: [BaseWeaponShotgun, BaseGunWieldable, BaseMinorContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponShotgun, BaseGunWieldable, BaseMinorContraband] # Corvax-Contraband id: WeaponShotgunBlunderbuss suffix: Pirate description: Deadly at close range. @@ -282,7 +282,7 @@ - type: entity name: improvised shotgun - parent: [BaseWeaponShotgun, BaseGunWieldable, BaseMinorContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponShotgun, BaseGunWieldable, BaseMinorContraband] # Corvax-Contraband id: WeaponShotgunImprovised description: A shitty, hand-made shotgun that uses .50 shotgun shells. It can only hold one round in the chamber. components: @@ -314,7 +314,7 @@ proto: ShellShotgunImprovised - type: entity - parent: [BaseWeaponShotgun, BaseGunWieldable, BaseSyndicateContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponShotgun, BaseGunWieldable, BaseSyndicateContraband] # Corvax-Contraband id: WeaponShotgunHushpup name: Hushpup description: An obscure modification of the Enforcer, fitted with an experimental muffler. Great for those with a strict moral code. Uses .50 shotgun shells. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 920dc1514c..c5246d94a9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -40,7 +40,7 @@ - type: entity name: Kardashev-Mosin - parent: [BaseWeaponSniper, BaseGunWieldable, SolutionDart, BaseMajorContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponSniper, BaseGunWieldable, SolutionDart, BaseMajorContraband] # Corvax-Contraband id: WeaponSniperMosin description: A true relic, the Kardashev-Mosin has served in nearly every armed conflict since its creation 670 years ago. The bolt-action design of the rifle remains virtually identical to its original design, whether used for hunting, sniping, or endless trench warfare. Loads 10 rounds of .30 rifle. components: @@ -88,7 +88,7 @@ - type: entity name: Hristov - parent: [BaseWeaponSniper, BaseGunWieldable, BaseSyndicateContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponSniper, BaseGunWieldable, BaseSyndicateContraband] # Corvax-Contraband id: WeaponSniperHristov description: For when you absolutely, positively need to make someone regret their life choices from a safe distance. Uses .60 anti-materiel ammo. components: @@ -129,7 +129,7 @@ - type: entity name: musket - parent: [ BaseWeaponSniper, BaseGunWieldable, BaseMajorContraband ] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponSniper, BaseGunWieldable, BaseMajorContraband] # Corvax-Contraband id: Musket description: This should've been in a museum long before you were born. Uses .60 anti-materiel ammo. components: @@ -170,7 +170,7 @@ - type: entity name: flintlock pistol - parent: [BaseWeaponSniper, BaseMajorContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponSniper, BaseMajorContraband] # Corvax-Contraband id: WeaponPistolFlintlock description: A pirate's companion. Yarrr! Uses .45 magnum ammo. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml index d87a2bdeb8..9e8a0020d3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml @@ -1,5 +1,5 @@ - type: entity - parent: [BaseWeaponBallisticTurret, BaseSyndicateContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponBallisticTurret, BaseSyndicateContraband] # Corvax-Contraband id: WeaponTurretSyndicate suffix: Syndicate components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml index 399e7c398e..88e99faf88 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml @@ -1,6 +1,6 @@ - type: entity name: improvised pneumatic cannon - parent: [BaseStorageItem, BaseMinorContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseStorageItem, BaseMinorContraband] # Corvax-Contraband id: WeaponImprovisedPneumaticCannon description: Improvised using nothing but a pipe, some zipties, and a pneumatic cannon. Doesn't accept tanks without enough gas. components: @@ -140,7 +140,7 @@ - type: entity name: syringe gun - parent: BaseStorageItem + parent: [BaseCorvaxContraband432DepartmentsMedical, BaseStorageItem] # Corvax-Contraband id: LauncherSyringe description: Load full of poisoned syringes for optimal fun. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml index 0a29ae8d0a..4f7cd14416 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml @@ -1,5 +1,5 @@ - type: entity - parent: [ FoodBreadBaguette, BaseSword, BaseSyndicateContraband ] + parent: [FoodBreadBaguette, BaseSword] # Corvax-Contraband: do not inherit a marker for hidden properties. id: WeaponBaguette suffix: Weapon components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cane.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cane.yml index cd0759bfac..b4d54a8724 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cane.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cane.yml @@ -29,7 +29,7 @@ - type: entity name: cane blade - parent: [BaseSword, BaseSyndicateContraband] + parent: BaseSword # Corvax-Contraband: do not inherit a marker for hidden properties. id: CaneBlade description: A sharp blade with a cane shaped hilt. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index 22de2a9033..2ed4c90bf0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -77,7 +77,7 @@ - type: entity name: energy sword - parent: [BaseMeleeWeaponEnergy, BaseSyndicateContraband] + parent: BaseMeleeWeaponEnergy # Corvax-Contraband: do not inherit a marker for hidden properties. id: EnergySword description: A very loud & dangerous sword with a beam made of pure, concentrated plasma. Cuts through unarmored targets like butter. components: @@ -195,6 +195,7 @@ Slash: 10 Heat: 10 deactivatedSecret: true + # Corvax-Contraband: activation must not re-add the removed legality marker. - type: ComponentToggler components: - type: Tool @@ -204,8 +205,6 @@ malus: 0.4 - type: Execution doAfterDuration: 4.0 - - type: Contraband - severity: Syndicate - type: Sprite sprite: Objects/Weapons/Melee/e_dagger.rsi layers: @@ -265,7 +264,7 @@ - type: entity name: energy cutlass - parent: [BaseMeleeWeaponEnergy, BaseMajorContraband] + parent: BaseMeleeWeaponEnergy # Corvax-Contraband: do not inherit a marker for hidden properties. id: EnergyCutlass description: An exotic energy weapon. components: @@ -290,7 +289,7 @@ - type: entity name: double-bladed energy sword - parent: [BaseMeleeWeaponEnergy, BaseSyndicateContraband] + parent: [BaseCorvaxContraband435, BaseMeleeWeaponEnergy] # Corvax-Contraband: explicit exception to the wiki. id: EnergySwordDouble description: Syndicate Command Interns thought that having one blade on the energy sword was not enough. This can be stored in pockets. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml index 6faa52681b..796e84bde2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml @@ -28,7 +28,7 @@ path: /Audio/Items/Culinary/chop.ogg - type: entity - parent: BaseKnife + parent: [BaseCorvaxContraband432JobsChef, BaseKnife] # Corvax-Contraband id: KitchenKnife name: kitchen knife description: A general purpose Chef's Knife made by Asters Merchant Guild. Guaranteed to stay sharp for years to come.. @@ -65,7 +65,7 @@ - type: entity name: butcher's cleaver - parent: BaseKnife + parent: [BaseCorvaxContraband432JobsChef, BaseKnife] # Corvax-Contraband id: ButchCleaver description: A huge blade used for chopping and chopping up meat. This includes clowns and clown-by-products. components: @@ -106,7 +106,7 @@ - type: entity name: combat knife - parent: [BaseKnife, BaseSecurityContraband] + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseKnife, BaseSecurityContraband] # Corvax-Contraband id: CombatKnife description: A deadly knife intended for melee confrontations. components: @@ -157,7 +157,7 @@ - type: entity name: survival knife - parent: [BaseSecurityCargoContraband, CombatKnife] + parent: [BaseCorvaxContraband432DepartmentsCargo, BaseSecurityCargoContraband, CombatKnife] # Corvax-Contraband id: SurvivalKnife description: Weapon of first and last resort for combatting space carp. components: @@ -356,8 +356,9 @@ - type: entity name: throwing knife - parent: [BaseKnife, BaseSyndicateContraband] - id: ThrowingKnife + parent: BaseKnife # Corvax-Contraband: shared behavior without a legality marker. + id: BaseThrowingKnife # Corvax-Contraband: also used by the disguised croissant. + abstract: true description: This blood-red knife is very aerodynamic and easy to throw, but good luck trying to fight someone hand-to-hand. components: - type: Tag @@ -406,6 +407,12 @@ restitution: 0.3 friction: 0.2 +# Corvax-Contraband-start: keep the visible knife classified separately. +- type: entity + parent: [BaseThrowingKnife, BaseSyndicateContraband] + id: ThrowingKnife +# Corvax-Contraband-end + - type: entity name: utility knife parent: BaseItem diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index fe4e65c100..322b08292d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -41,7 +41,7 @@ - type: entity name: mining drill - parent: BaseItem + parent: [BaseCorvaxContraband432DepartmentsCargo, BaseItem] # Corvax-Contraband id: MiningDrill description: Powerful tool used to quickly drill through rocks. components: @@ -100,7 +100,7 @@ # Very high burst damage if you land a mark, while also providing a small amount of healing. - type: entity - parent: [BaseWeaponCrusher, BaseSecurityCargoContraband] + parent: [BaseCorvaxContraband432DepartmentsCargo, BaseWeaponCrusher, BaseSecurityCargoContraband] # Corvax-Contraband id: WeaponCrusher components: - type: Tag @@ -165,7 +165,7 @@ # No mark ability in exchange for wideswing, autoattack, and being one-handed - type: entity - parent: [ BaseKnife, BaseWeaponCrusher, BaseSecurityCargoContraband] + parent: [BaseCorvaxContraband432DepartmentsCargo, BaseKnife, BaseWeaponCrusher, BaseSecurityCargoContraband] # Corvax-Contraband id: WeaponCrusherDagger name: crusher dagger description: A scaled down version of a proto-kinetic crusher. Uses kinetic energy to vibrate the blade at high speeds. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml index c37cb1cb8a..02351be318 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml @@ -1,6 +1,6 @@ - type: entity name: stun prod - parent: [BaseItem, BaseMinorContraband] + parent: [BaseCorvaxContraband432DepartmentsSecurity, BaseItem, BaseMinorContraband] # Corvax-Contraband id: Stunprod description: A stun prod for illegal incapacitation. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index 4e233958da..81aa741a60 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -132,12 +132,10 @@ - type: entity name: energy katana - parent: Katana + parent: [BaseCorvaxContraband435, Katana] # Corvax-Contraband id: EnergyKatana description: A katana infused with strong energy. components: - - type: Contraband - severity: HighlyIllegal - type: Sprite sprite: Objects/Weapons/Melee/energykatana.rsi - type: MeleeWeapon diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml index a9203fe8ae..517928b9cf 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml @@ -53,7 +53,7 @@ friction: 0.2 - type: entity - parent: BaseBola + parent: [BaseCorvaxContraband432DepartmentsSecurity, BaseBola] # Corvax-Contraband id: Bola name: makeshift bola description: A makeshift bola, cobbled together with some spare cuffs and metal. It doesn't look like it's going to stay together for very long. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/canister_grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/canister_grenades.yml index 3b4bbdf036..537e4bb47e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/canister_grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/canister_grenades.yml @@ -46,7 +46,7 @@ - CleanerGrenade - type: entity - parent: SmokeGrenade + parent: [BaseCorvaxContraband432DepartmentsSecurity, SmokeGrenade] # Corvax-Contraband id: TearGasGrenade name: tear gas grenade description: A riot control tear gas grenade. Causes irritation, pain and makes you cry your eyes out. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml index e8316c0de2..9f0611247e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml @@ -1,5 +1,5 @@ - type: entity - parent: [ FoodBakedCroissant, ThrowingKnife ] + parent: [FoodBakedCroissant, BaseThrowingKnife] # Corvax-Contraband: do not inherit a marker for hidden properties. id: WeaponCroissant suffix: Weapon components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml index f9fe43d803..6b94e39c54 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml @@ -1,7 +1,7 @@ - type: entity name: explosive grenade description: Grenade that creates a small but devastating explosion. - parent: [VolatileGrenadeBase, TimerGrenadeBase, BaseSyndicateContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, VolatileGrenadeBase, TimerGrenadeBase, BaseSyndicateContraband] # Corvax-Contraband id: ExGrenade components: - type: ExplodeOnTrigger @@ -24,7 +24,7 @@ - type: entity name: flashbang description: Eeeeeeeeeeeeeeeeeeeeee. - parent: [ FragileGrenadeBase, TimerGrenadeBase, BaseSecurityContraband ] + parent: [BaseCorvaxContraband432DepartmentsSecurity, FragileGrenadeBase, TimerGrenadeBase, BaseSecurityContraband] # Corvax-Contraband id: GrenadeFlashBang components: - type: Sprite @@ -307,7 +307,7 @@ path: /Audio/Effects/countdown.ogg - type: entity - parent: [ BaseItem, BaseItemDestructible ] + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseItem, BaseItemDestructible] # Corvax-Contraband id: ModularGrenade name: modular grenade description: A grenade casing. Requires a trigger and a payload. @@ -353,7 +353,7 @@ - type: entity name: EMP grenade description: A grenade designed to wreak havoc on electronic systems. - parent: [ImpactGrenadeBase, BaseSyndicateContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, ImpactGrenadeBase, BaseSyndicateContraband] # Corvax-Contraband id: EmpGrenade components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml index ab37f18b1b..bd5ffc2e82 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml @@ -78,7 +78,7 @@ path: /Audio/Effects/countdown.ogg - type: entity - parent: [FragileGrenadeBase, ProjectileGrenadeBase, BaseSyndicateContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, FragileGrenadeBase, ProjectileGrenadeBase, BaseSyndicateContraband] # Corvax-Contraband id: GrenadeIncendiary name: incendiary grenade description: Guaranteed to light up the mood. @@ -110,7 +110,7 @@ price: 1500 - type: entity - parent: [FragileGrenadeBase, ProjectileGrenadeBase, BaseSyndicateContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, FragileGrenadeBase, ProjectileGrenadeBase, BaseSyndicateContraband] # Corvax-Contraband id: GrenadeShrapnel name: shrapnel grenade description: Releases a deadly spray of shrapnel that causes severe bleeding. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml index 435186f2f9..a933a565e6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml @@ -10,7 +10,7 @@ - type: ScatteringGrenade - type: entity - parent: [FragileGrenadeBase, ScatteringGrenadeBase, TimerGrenadeBase, BaseSecurityContraband] + parent: [BaseCorvaxContraband432DepartmentsSecurity, FragileGrenadeBase, ScatteringGrenadeBase, TimerGrenadeBase, BaseSecurityContraband] # Corvax-Contraband id: ClusterBang name: clusterbang description: Can be used only with flashbangs. Explodes several times. @@ -63,7 +63,7 @@ positional: true - type: entity - parent: [VolatileGrenadeBase, ScatteringGrenadeBase, TimerGrenadeBase, BaseSyndicateContraband] + parent: [BaseCorvaxContraband434DepartmentsSecurity, VolatileGrenadeBase, ScatteringGrenadeBase, TimerGrenadeBase, BaseSyndicateContraband] # Corvax-Contraband id: ClusterGrenade name: clustergrenade description: Why use one grenade when you can use three at once! diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml index b68aea0f7c..e01495d036 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml @@ -1,6 +1,6 @@ - type: entity name: stun baton - parent: [BaseItem, BaseSecurityContraband] + parent: [BaseCorvaxContraband432DepartmentsSecurity, BaseItem, BaseSecurityContraband] # Corvax-Contraband id: Stunbaton description: A stun baton for incapacitating people with. Actively harming with this is considered bad tone. components: @@ -139,7 +139,7 @@ - type: entity name: flash - parent: [BaseItem, BaseSecurityScienceCommandContraband] + parent: [BaseCorvaxContraband432DepartmentsSecurity, BaseItem, BaseSecurityScienceCommandContraband] # Corvax-Contraband id: Flash description: An ultrabright flashbulb with a trigger, which causes the victim to be dazed and lose their eyesight for a moment. Useless when burnt out. components: diff --git a/Resources/Prototypes/Entities/Objects/base_contraband.yml b/Resources/Prototypes/Entities/Objects/base_contraband.yml index bfea4b8c8a..08897c5b39 100644 --- a/Resources/Prototypes/Entities/Objects/base_contraband.yml +++ b/Resources/Prototypes/Entities/Objects/base_contraband.yml @@ -1,63 +1,63 @@ # generic "highly illegal" contraband; Syndicate/magical contraband are already considered highly illegal under Space Law, # so this is mostly for stuff that should be equally illegal but doesn't need its own unique contraband tier added - type: entity + parent: BaseCorvaxContraband435 # Corvax-Contraband id: BaseHighlyIllegalContraband abstract: true - components: - - type: Contraband - severity: HighlyIllegal # used by the unique items of xenoborgs (like modules and stuff) - type: entity + parent: BaseCorvaxContraband435 # Corvax-Contraband id: BaseXenoborgContraband abstract: true - components: - - type: Contraband - severity: HighlyIllegal # any type of magical items used by wizards and similiar - type: entity + parent: BaseCorvaxContraband436 # Corvax-Contraband id: BaseMagicalContraband abstract: true - components: - - type: Contraband - severity: Magical # non-stealth syndicate stuff - type: entity + parent: BaseCorvaxContraband435 # Corvax-Contraband id: BaseSyndicateContraband abstract: true - components: - - type: Contraband - severity: Syndicate - allowedDepartments: [ ] - allowedJobs: [ ] # minor contraband not departmentally restricted -- improvised weapons etc - type: entity id: BaseMinorContraband abstract: true components: + # Corvax-Contraband-start - type: Contraband - severity: Minor + severity: Corvax433 + allowedDepartments: [] + allowedJobs: [] + # Corvax-Contraband-end # major contraband, for things like guns or weaponry that don't belong to any department and aren't syndicate specific - type: entity id: BaseMajorContraband abstract: true components: + # Corvax-Contraband-start - type: Contraband - severity: Major + severity: Corvax434 + allowedDepartments: [] + allowedJobs: [] + # Corvax-Contraband-end # base department restricted contraband, this should only be used as a parent for other contraband prototypes, not the restricted items themselves. - type: entity id: BaseRestrictedContraband abstract: true components: + # Corvax-Contraband-start - type: Contraband - severity: Restricted - allowedDepartments: [ ] - allowedJobs: [ ] + severity: Corvax431 + allowedDepartments: [] + allowedJobs: [] + # Corvax-Contraband-end # one department restricted contraband - type: entity diff --git a/Resources/Prototypes/Entities/Structures/Decoration/banners.yml b/Resources/Prototypes/Entities/Structures/Decoration/banners.yml index c0efbefac8..4b72826c2c 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/banners.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/banners.yml @@ -80,7 +80,7 @@ - type: entity id: BannerRevolution - parent: BannerBase + parent: [BaseCorvaxContraband131, BannerBase] # Corvax-Contraband name: revolution banner description: A banner displaying revolution. Viva! components: @@ -90,7 +90,7 @@ - type: entity id: BannerSyndicate - parent: BannerBase + parent: [BaseCorvaxContraband131, BannerBase] # Corvax-Contraband name: syndicate banner description: A banner from which, according to the syndicate, you should feel hatred for NT. components: diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index f835ebdb31..7f59c57425 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -358,7 +358,7 @@ - type: AmbientMusicMarkerMedical - type: entity - parent: BaseComputerAiAccess + parent: [BaseCorvaxContraband433DepartmentsCommandSecurity, BaseComputerAiAccess] # Corvax-Contraband id: ComputerCriminalRecords name: criminal records computer description: This can be used to check criminal records. Only security can modify them. @@ -663,7 +663,7 @@ - AnalysisConsole - type: entity - parent: BaseComputerAiAccess + parent: [BaseCorvaxContraband433DepartmentsCommand, BaseComputerAiAccess] # Corvax-Contraband id: ComputerId name: ID card computer description: Terminal for programming Nanotrasen employee ID cards to access parts of the station. @@ -740,7 +740,7 @@ - type: AmbientMusicMarkerMedical - type: entity - parent: BaseComputerAiAccess + parent: [BaseCorvaxContraband433DepartmentsCommand, BaseComputerAiAccess] # Corvax-Contraband id: ComputerComms name: communications computer description: A computer used to make station wide announcements via keyboard, set the appropriate alert level, and call the emergency shuttle. @@ -1384,7 +1384,7 @@ # Corvax-StealTarget-end - type: entity - parent: BaseComputer + parent: [BaseCorvaxContraband433DepartmentsCommandSecurity, BaseComputer] # Corvax-Contraband id: ComputerSurveillanceCameraMonitor name: camera monitor description: A surveillance camera monitor. You're watching them. Maybe. diff --git a/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml b/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml index a4c23c5781..ae5e56fec9 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml @@ -1,6 +1,6 @@ - type: entity id: MachineArtifactAnalyzer - parent: [ BaseMachinePowered, SmallConstructibleMachine, BaseSmallConstructibleMachineDestructible ] + parent: [BaseCorvaxContraband431DepartmentsScience, BaseMachinePowered, SmallConstructibleMachine, BaseSmallConstructibleMachineDestructible] # Corvax-Contraband name: artifact analyzer description: A platform capable of performing analysis on various types of artifacts. components: diff --git a/Resources/Prototypes/Entities/Structures/Machines/bombs.yml b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml index 3790aba581..5ac4c52b12 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/bombs.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml @@ -94,7 +94,7 @@ disposable: false - type: entity - parent: [BaseHardBomb, BaseSyndicateContraband] + parent: [BaseCorvaxContraband436, BaseHardBomb, BaseSyndicateContraband] # Corvax-Contraband id: SyndicateBomb name: syndicate bomb description: A bomb for Syndicate operatives and agents alike. The real deal, no more training, get to it! diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 376f63d2f9..03b4c2ea7e 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -364,7 +364,7 @@ - type: entity id: SecurityTechFab - parent: BaseLatheLube + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseLatheLube] # Corvax-Contraband name: security techfab description: Prints equipment for use by security crew. components: @@ -413,7 +413,7 @@ - type: entity id: AmmoTechFab - parent: BaseLatheLube + parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseLatheLube] # Corvax-Contraband name: ammo techfab description: Prints the bare minimum of bullets that any budget military or armory could need. Nothing fancy. components: diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 63117a34b9..2b627fb0cc 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -1855,7 +1855,7 @@ access: [["Research"]] - type: entity - parent: VendingMachine + parent: [BaseCorvaxContraband131, VendingMachine] # Corvax-Contraband id: VendingMachineSyndieDrobe name: SyndieDrobe description: Wardrobe machine encoded by the syndicate, contains elite outfits for various operations. diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml index e9a8fe1385..18d4ee4969 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml @@ -317,6 +317,12 @@ description: A Radioisotope Thermoelectric Generator for long term power. This one has damaged shielding. suffix: 10kW components: + # Corvax-Contraband-start + - type: Contraband + severity: Corvax434 + allowedDepartments: [Engineering] + allowedJobs: [] + # Corvax-Contraband-end - type: Sprite layers: - state: rtg_damaged diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/big_boxes.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/big_boxes.yml index 5c3287faf7..9607da0341 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/big_boxes.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/big_boxes.yml @@ -83,7 +83,7 @@ - type: entity id: StealthBox suffix: stealth - parent: BaseBigBox + parent: [BaseCorvaxContraband435, BaseBigBox] # Corvax-Contraband description: Kept ya waiting, huh? components: - type: Damageable diff --git a/Resources/Prototypes/Magic/staves.yml b/Resources/Prototypes/Magic/staves.yml index 424dfea339..0f4d7bb8a3 100644 --- a/Resources/Prototypes/Magic/staves.yml +++ b/Resources/Prototypes/Magic/staves.yml @@ -39,7 +39,7 @@ - type: entity id: AnimationStaff - parent: [ BaseItem, BaseMagicalContraband ] + parent: BaseItem # Corvax-Contraband: do not inherit a marker for hidden properties. name: staff of animation description: Brings inanimate objects to life! components: diff --git a/Resources/Prototypes/Magic/teleport_scroll.yml b/Resources/Prototypes/Magic/teleport_scroll.yml index fbef3f74ed..ce5e00da76 100644 --- a/Resources/Prototypes/Magic/teleport_scroll.yml +++ b/Resources/Prototypes/Magic/teleport_scroll.yml @@ -2,7 +2,7 @@ id: WizardTeleportScroll name: teleport scroll suffix: Wizard - parent: [ BaseItem, BaseMagicalContraband ] + parent: BaseItem # Corvax-Contraband: do not inherit a marker for hidden properties. components: - type: UserInterface interfaces: diff --git a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml index 378b9fe224..c1963a5016 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml @@ -182,6 +182,7 @@ - type: reagent id: CapsaicinOil + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-capsaicin-oil group: Foods desc: reagent-desc-capsaicin-oil diff --git a/Resources/Prototypes/Reagents/biological.yml b/Resources/Prototypes/Reagents/biological.yml index 41df67041e..4bbed1323d 100644 --- a/Resources/Prototypes/Reagents/biological.yml +++ b/Resources/Prototypes/Reagents/biological.yml @@ -203,6 +203,7 @@ - type: reagent id: Ichor + contrabandSeverity: Corvax445 # Corvax-Contraband name: reagent-name-ichor group: Biological desc: reagent-desc-ichor diff --git a/Resources/Prototypes/Reagents/botany.yml b/Resources/Prototypes/Reagents/botany.yml index 9dea63ecab..1f38209c1b 100644 --- a/Resources/Prototypes/Reagents/botany.yml +++ b/Resources/Prototypes/Reagents/botany.yml @@ -20,6 +20,7 @@ - type: reagent id: Left4Zed + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-left4-zed group: Botanical desc: reagent-desc-left4-zed @@ -52,6 +53,7 @@ - type: reagent id: PestKiller + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-pest-killer group: Botanical desc: reagent-desc-pest-killer @@ -76,6 +78,7 @@ - type: reagent id: PlantBGone + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-plant-b-gone group: Botanical desc: reagent-desc-plant-b-gone @@ -110,6 +113,7 @@ - type: reagent id: RobustHarvest + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-robust-harvest group: Botanical desc: reagent-desc-robust-harvest @@ -178,6 +182,7 @@ - type: reagent id: WeedKiller + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-weed-killer group: Botanical desc: reagent-desc-weed-killer @@ -202,6 +207,7 @@ - type: reagent id: Ammonia + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-ammonia group: Botanical desc: reagent-desc-ammonia @@ -284,6 +290,7 @@ - type: reagent id: Diethylamine + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-diethylamine group: Botanical desc: reagent-desc-diethylamine diff --git a/Resources/Prototypes/Reagents/chemicals.yml b/Resources/Prototypes/Reagents/chemicals.yml index 8a6848e935..8380d594f7 100644 --- a/Resources/Prototypes/Reagents/chemicals.yml +++ b/Resources/Prototypes/Reagents/chemicals.yml @@ -54,6 +54,7 @@ - type: reagent id: Lye + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-lye desc: reagent-desc-lye flavor: alkaline @@ -76,6 +77,7 @@ - type: reagent id: Artifexium + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-artifexium desc: reagent-desc-artifexium flavor: metallic @@ -100,6 +102,7 @@ - type: reagent parent: Artifexium id: ArtifactGlue + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-artifact-glue desc: reagent-desc-artifact-glue flavor: artifactglue diff --git a/Resources/Prototypes/Reagents/cleaning.yml b/Resources/Prototypes/Reagents/cleaning.yml index 0ac63ee0a6..b0c6f9550c 100644 --- a/Resources/Prototypes/Reagents/cleaning.yml +++ b/Resources/Prototypes/Reagents/cleaning.yml @@ -1,5 +1,6 @@ - type: reagent id: Bleach + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-bleach desc: reagent-desc-bleach physicalDesc: reagent-physical-desc-strong-smelling diff --git a/Resources/Prototypes/Reagents/elements.yml b/Resources/Prototypes/Reagents/elements.yml index aa59d724e7..108ba77200 100644 --- a/Resources/Prototypes/Reagents/elements.yml +++ b/Resources/Prototypes/Reagents/elements.yml @@ -22,6 +22,7 @@ - type: reagent id: Chlorine + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-chlorine group: Elements desc: reagent-desc-chlorine @@ -49,6 +50,7 @@ - type: reagent id: Copper + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-copper group: Elements desc: reagent-desc-copper @@ -77,6 +79,7 @@ - type: reagent id: Fluorine + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-fluorine group: Elements desc: reagent-desc-fluorine @@ -137,6 +140,7 @@ - type: reagent id: Iron + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-iron group: Elements desc: reagent-desc-iron @@ -165,6 +169,7 @@ - type: reagent id: Lithium + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-lithium group: Elements desc: reagent-desc-lithium @@ -192,6 +197,7 @@ - type: reagent id: Mercury + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-mercury group: Elements desc: reagent-desc-mercury @@ -242,6 +248,7 @@ - type: reagent id: Radium + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-radium group: Elements parent: Uranium @@ -254,6 +261,7 @@ - type: reagent id: Silicon + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-silicon group: Elements desc: reagent-desc-silicon @@ -283,6 +291,7 @@ - type: reagent id: Sulfur + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-sulfur group: Elements desc: reagent-desc-sulfur @@ -312,6 +321,7 @@ - type: reagent id: Uranium + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-uranium group: Elements desc: reagent-desc-uranium diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml index 9e28805560..718e71ef88 100644 --- a/Resources/Prototypes/Reagents/fun.yml +++ b/Resources/Prototypes/Reagents/fun.yml @@ -49,7 +49,7 @@ group: Toxins desc: reagent-desc-buzzochloric-bees physicalDesc: reagent-physical-desc-buzzy - contrabandSeverity: Minor + contrabandSeverity: Corvax444 # Corvax-Contraband flavor: bee color: "#FFD35D" tileReactions: @@ -173,6 +173,7 @@ - type: reagent id: Razorium + contrabandSeverity: Corvax444 # Corvax-Contraband name: reagent-name-razorium group: Toxins slipData: @@ -399,6 +400,7 @@ - type: reagent id: Felinase + contrabandSeverity: Corvax445 # Corvax-Contraband name: reagent-name-catessence group: Toxins desc: reagent-desc-catessence diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml index 13c1489068..d8c8fc3091 100644 --- a/Resources/Prototypes/Reagents/gases.yml +++ b/Resources/Prototypes/Reagents/gases.yml @@ -76,6 +76,7 @@ - type: reagent id: Plasma + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-plasma desc: reagent-desc-plasma physicalDesc: reagent-physical-desc-gaseous @@ -218,6 +219,7 @@ - type: reagent id: Nitrogen + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-nitrogen desc: reagent-desc-nitrogen physicalDesc: reagent-physical-desc-gaseous @@ -329,6 +331,7 @@ - type: reagent id: Frezon + contrabandSeverity: Corvax444 # Corvax-Contraband name: reagent-name-frezon desc: reagent-desc-frezon physicalDesc: reagent-physical-desc-gaseous diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index dc258cdf84..6da7486a85 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -1,5 +1,6 @@ - type: reagent id: Cryptobiolin + contrabandSeverity: Corvax443 # Corvax-Contraband name: reagent-name-cryptobiolin group: Medicine desc: reagent-desc-cryptobiolin @@ -204,6 +205,7 @@ - type: reagent id: Doxarubixadone + contrabandSeverity: Corvax443 # Corvax-Contraband name: reagent-name-doxarubixadone group: Medicine desc: reagent-desc-doxarubixadone @@ -976,6 +978,7 @@ - type: reagent id: Ethyloxyephedrine + contrabandSeverity: Corvax443 # Corvax-Contraband name: reagent-name-ethyloxyephedrine desc: reagent-desc-ethyloxyephedrine group: Medicine @@ -1215,6 +1218,7 @@ - type: reagent id: Pyrazine + contrabandSeverity: Corvax443 # Corvax-Contraband name: reagent-name-pyrazine group: Medicine desc: reagent-desc-pyrazine @@ -1255,6 +1259,7 @@ - type: reagent id: Insuzine + contrabandSeverity: Corvax443 # Corvax-Contraband name: reagent-name-insuzine group: Medicine desc: reagent-desc-insuzine @@ -1302,6 +1307,7 @@ - type: reagent id: Opporozidone #Name based of an altered version of the startreck chem "Opporozine" + contrabandSeverity: Corvax443 # Corvax-Contraband name: reagent-name-opporozidone group: Medicine desc: reagent-desc-opporozidone @@ -1385,6 +1391,7 @@ - type: reagent id: Psicodine + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-psicodine group: Medicine desc: reagent-desc-psicodine diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml index 5b7d3caed6..d87f810aae 100644 --- a/Resources/Prototypes/Reagents/narcotics.yml +++ b/Resources/Prototypes/Reagents/narcotics.yml @@ -4,7 +4,7 @@ group: Narcotics desc: reagent-desc-desoxyephedrine physicalDesc: reagent-physical-desc-translucent - contrabandSeverity: Minor + contrabandSeverity: Corvax445 # Corvax-Contraband flavor: bitter color: "#FAFAFA" boilingPoint: 212.0 # Dexosyephedrine vape when? @@ -66,6 +66,7 @@ - type: reagent id: Ephedrine + contrabandSeverity: Corvax443 # Corvax-Contraband name: reagent-name-ephedrine group: Narcotics desc: reagent-desc-ephedrine @@ -123,6 +124,7 @@ - type: reagent id: Pax + contrabandSeverity: Corvax444 # Corvax-Contraband name: reagent-name-pax group: Narcotics desc: reagent-desc-pax @@ -145,7 +147,7 @@ group: Narcotics desc: reagent-desc-stimulants physicalDesc: reagent-physical-desc-energizing - contrabandSeverity: Syndicate + contrabandSeverity: Corvax445 # Corvax-Contraband flavor: sharp color: "#9A040E" boilingPoint: 212.0 @@ -229,6 +231,7 @@ - type: reagent id: THC + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-thc group: Narcotics desc: reagent-desc-thc @@ -268,7 +271,7 @@ group: Narcotics desc: reagent-desc-impedrezene physicalDesc: reagent-physical-desc-acrid - contrabandSeverity: Minor + contrabandSeverity: Corvax442 # Corvax-Contraband flavor: bitter color: "#215263" metabolisms: @@ -292,6 +295,7 @@ - type: reagent id: SpaceDrugs + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-space-drugs group: Narcotics desc: reagent-desc-space-drugs @@ -308,6 +312,7 @@ - type: reagent id: Bananadine + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-bananadine group: Narcotics desc: reagent-desc-bananadine @@ -329,7 +334,7 @@ group: Narcotics desc: reagent-desc-nocturine physicalDesc: reagent-physical-desc-powdery - contrabandSeverity: Syndicate + contrabandSeverity: Corvax444 # Corvax-Contraband color: "#128e80" boilingPoint: 444.0 meltingPoint: 128.0 @@ -390,7 +395,7 @@ group: Narcotics desc: reagent-desc-norepinephric-acid physicalDesc: reagent-physical-desc-milky - contrabandSeverity: Minor + contrabandSeverity: Corvax442 # Corvax-Contraband flavor: salty color: "#96a8b5" boilingPoint: 255.0 @@ -601,6 +606,7 @@ - type: reagent id: Happiness + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-happiness group: Narcotics desc: reagent-desc-happiness diff --git a/Resources/Prototypes/Reagents/pyrotechnic.yml b/Resources/Prototypes/Reagents/pyrotechnic.yml index 2964c4bc88..b4c567854f 100644 --- a/Resources/Prototypes/Reagents/pyrotechnic.yml +++ b/Resources/Prototypes/Reagents/pyrotechnic.yml @@ -19,7 +19,7 @@ parent: BasePyrotechnic desc: reagent-desc-thermite physicalDesc: reagent-physical-desc-grainy - contrabandSeverity: Minor + contrabandSeverity: Corvax444 # Corvax-Contraband flavor: bitter color: "#757245" boilingPoint: 2977.0 # Aluminum oxide @@ -42,7 +42,7 @@ parent: BasePyrotechnic desc: reagent-desc-napalm physicalDesc: reagent-physical-desc-soapy - contrabandSeverity: Major + contrabandSeverity: Corvax444 # Corvax-Contraband flavor: bitter color: "#FA00AF" tileReactions: @@ -72,7 +72,7 @@ parent: BasePyrotechnic desc: reagent-desc-phlogiston physicalDesc: reagent-physical-desc-burning - contrabandSeverity: Major + contrabandSeverity: Corvax444 # Corvax-Contraband flavor: bitter color: "#D4872A" metabolisms: @@ -102,7 +102,7 @@ parent: BasePyrotechnic desc: reagent-desc-chlorine-trifluoride physicalDesc: reagent-physical-desc-blazing - contrabandSeverity: Major + contrabandSeverity: Corvax444 # Corvax-Contraband flavor: bitter color: "#FFC8C8" tileReactions: diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index 4c8824e9a5..568e2166db 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -6,7 +6,7 @@ flavor: bitter color: "#cf3600" physicalDesc: reagent-physical-desc-opaque - contrabandSeverity: Minor + contrabandSeverity: Corvax444 # Corvax-Contraband plantMetabolism: - !type:PlantAdjustToxins amount: 10 @@ -22,6 +22,7 @@ - type: reagent id: CarpoToxin + contrabandSeverity: Corvax444 # Corvax-Contraband name: reagent-name-carpotoxin group: Toxins desc: reagent-desc-carpotoxin @@ -50,6 +51,7 @@ - type: reagent id: ChloralHydrate + contrabandSeverity: Corvax444 # Corvax-Contraband name: reagent-name-chloral-hydrate group: Toxins desc: reagent-desc-chloral-hydrate @@ -82,6 +84,7 @@ - type: reagent id: GastroToxin + contrabandSeverity: Corvax444 # Corvax-Contraband name: reagent-name-gastrotoxin group: Toxins desc: reagent-desc-gastrotoxin @@ -104,6 +107,7 @@ - type: reagent id: Mold + contrabandSeverity: Corvax444 # Corvax-Contraband name: reagent-name-mold group: Toxins desc: reagent-desc-mold @@ -125,7 +129,7 @@ group: Toxins desc: reagent-desc-polytrinic-acid physicalDesc: reagent-physical-desc-strong-smelling - contrabandSeverity: Major + contrabandSeverity: Corvax444 # Corvax-Contraband flavor: acid color: "#a1000b" boilingPoint: 78.2 # This isn't a real chemical... @@ -168,6 +172,7 @@ - type: reagent id: FerrochromicAcid + contrabandSeverity: Corvax444 # Corvax-Contraband name: reagent-name-ferrochromic-acid group: Toxins desc: reagent-desc-ferrochromic-acid @@ -193,7 +198,7 @@ group: Toxins desc: reagent-desc-fluorosulfuric-acid physicalDesc: reagent-physical-desc-strong-smelling - contrabandSeverity: Minor + contrabandSeverity: Corvax444 # Corvax-Contraband flavor: acid color: "#5050ff" boilingPoint: 165 @@ -229,6 +234,7 @@ - type: reagent id: SulfuricAcid + contrabandSeverity: Corvax444 # Corvax-Contraband name: reagent-name-sulfuric-acid group: Toxins desc: reagent-desc-sulfuric-acid @@ -278,6 +284,7 @@ - type: reagent id: UnstableMutagen + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-unstable-mutagen group: Toxins desc: reagent-desc-unstable-mutagen @@ -306,7 +313,7 @@ group: Toxins desc: reagent-desc-heartbreaker-toxin physicalDesc: reagent-physical-desc-strong-smelling - contrabandSeverity: Major + contrabandSeverity: Corvax444 # Corvax-Contraband color: "#5f959c" metabolisms: Bloodstream: @@ -325,7 +332,7 @@ group: Toxins desc: reagent-desc-lexorin physicalDesc: reagent-physical-desc-pungent - contrabandSeverity: Syndicate + contrabandSeverity: Corvax444 # Corvax-Contraband color: "#6b0007" metabolisms: Bloodstream: @@ -338,6 +345,7 @@ - type: reagent id: MindbreakerToxin + contrabandSeverity: Corvax442 # Corvax-Contraband name: reagent-name-mindbreaker-toxin group: Toxins desc: reagent-desc-mindbreaker-toxin @@ -358,6 +366,7 @@ - type: reagent id: Histamine + contrabandSeverity: Corvax444 # Corvax-Contraband name: reagent-name-histamine group: Toxins desc: reagent-desc-histamine @@ -428,7 +437,7 @@ group: Toxins desc: reagent-desc-amatoxin physicalDesc: reagent-physical-desc-nondescript - contrabandSeverity: Major + contrabandSeverity: Corvax444 # Corvax-Contraband color: "#D6CE7B" metabolisms: Bloodstream: @@ -441,6 +450,7 @@ - type: reagent id: VentCrud + contrabandSeverity: Corvax444 # Corvax-Contraband name: reagent-name-vent-crud group: Toxins desc: reagent-desc-vent-crud @@ -461,7 +471,7 @@ group: Toxins desc: reagent-desc-romerol physicalDesc: reagent-physical-desc-necrotic - contrabandSeverity: Syndicate + contrabandSeverity: Corvax436 # Corvax-Contraband flavor: bitter color: "#7e916e" worksOnTheDead: true @@ -586,7 +596,7 @@ group: Toxins desc: reagent-desc-lead physicalDesc: reagent-physical-desc-metallic - contrabandSeverity: Major + contrabandSeverity: Corvax442 # Corvax-Contraband color: "#5C6274" metabolisms: Bloodstream: @@ -603,7 +613,7 @@ group: Toxins desc: reagent-desc-bungotoxin physicalDesc: reagent-physical-desc-nondescript - contrabandSeverity: Major + contrabandSeverity: Corvax444 # Corvax-Contraband color: "#EBFF8E" metabolisms: Bloodstream: @@ -620,7 +630,7 @@ group: Toxins desc: reagent-desc-vestine physicalDesc: reagent-physical-desc-shiny - contrabandSeverity: Syndicate + contrabandSeverity: Corvax444 # Corvax-Contraband flavor: medicine color: "#435166" plantMetabolism: @@ -651,7 +661,7 @@ group: Toxins desc: reagent-desc-tazinide physicalDesc: reagent-physical-desc-metallic - contrabandSeverity: Syndicate + contrabandSeverity: Corvax444 # Corvax-Contraband flavor: shocking color: "#FDD023" metabolisms: @@ -664,6 +674,7 @@ - type: reagent id: Lipolicide + contrabandSeverity: Corvax444 # Corvax-Contraband name: reagent-name-lipolicide group: Toxins desc: reagent-desc-lipolicide @@ -691,6 +702,7 @@ # poisons non-spiders and slows you down at high doses - type: reagent id: Mechanotoxin + contrabandSeverity: Corvax444 # Corvax-Contraband name: reagent-name-mechanotoxin group: Toxins desc: reagent-desc-mechanotoxin From a444f26f9f5211548fb8b51fe136f90b1fb3253b Mon Sep 17 00:00:00 2001 From: _Svist_ <148935188+Svist666s@users.noreply.github.com> Date: Thu, 10 Sep 2026 23:39:51 +0400 Subject: [PATCH 2/5] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=A1=D0=A0=D0=9F=20(#3727)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/corvax/guidebook/SOP/security.ftl | 127 ++++++++++-------- .../guidebook/corporatelaw/articles.ftl | 1 + 2 files changed, 70 insertions(+), 58 deletions(-) diff --git a/Resources/Locale/ru-RU/corvax/guidebook/SOP/security.ftl b/Resources/Locale/ru-RU/corvax/guidebook/SOP/security.ftl index 5c149cfc86..10ee6300b6 100644 --- a/Resources/Locale/ru-RU/corvax/guidebook/SOP/security.ftl +++ b/Resources/Locale/ru-RU/corvax/guidebook/SOP/security.ftl @@ -1,6 +1,6 @@ # Общие СРП guidebook-SOP-security-general-must = - 1. Соблюдать все установленные процедуры отдела службы безопасности в рамках своей должности. + 1. Соблюдать все установленные процедуры отдела Службы безопасности в рамках своей должности. 1. Применять меры подавления в отношении нарушителей в соответствии с уровнем угрозы, который они представляют. 1. Поддерживать датчики костюма в режиме «Координаты». 1. Соблюдать субординацию и использовать [tooltip="guidebook-SOP-security-tooltip-regulation-speech" text="уставную речь"] при общении с сотрудниками СБ, членами командования, сотрудниками юридического департамента, представителями Центрального Командования и ДСО. @@ -24,15 +24,21 @@ guidebook-SOP-security-general-right = - В [color=dodgerblue][bold]синий код[/bold][/color] с устного разрешения капитана получить [tooltip="guidebook-SOP-security-tooltip-extended-access" text="расширенный доступ"]. - В [color=red][bold]красный код[/bold][/color] по своему запросу получить [tooltip="guidebook-SOP-security-tooltip-extended-access" text="расширенный доступ"]. - В [color=gold][bold]гамма код[/bold][/color] получить [tooltip="guidebook-SOP-security-tooltip-full-access" text="полный доступ"]. - 1. В рамках проведения процедур службы безопасности подавать запросы главам станции для получения требуемой информации. + 1. В рамках проведения процедур Службы безопасности подавать запросы главам станции для получения требуемой информации. 1. Составить рапорт о задержании, в котором подробно описываются обстоятельства задержания, основания, ход и результаты обыска, свидетели, а также иные сведения, имеющие значение для разбирательства. + 1. Оцепить место преступления с помощью щитов, голобарьеров, маркеров улик и прочих инструментов Службы безопасности (исключая барьеры и стационарные вспышки) в целях проведения расследования. + - Для создания оцепления необходимо одобрение ГСБ или капитана. Обязательно уведомление экипажа о создании оцепления в общий канал связи. + - Район не может быть оцеплен более, чем на 5 минут и не может оцепляться повторно в рамках того же дела. + - Пересечение оцепленной территории членами экипажа расценивается как помеха при проведении следственных мероприятий. + guidebook-SOP-security-general-prohibited = - 1. Проводить процедуры СБ в отношении равных либо старших по иерархии сотрудников СБ, лиц с [tooltip="guidebook-SOP-security-tooltip-legal-immunity" text="юридической неприкосновенностью"] без приказа уполномоченного лица. + 1. Проводить процедуры СБ и применять силу в отношении равных либо старших по иерархии сотрудников СБ, лиц с [tooltip="guidebook-SOP-security-tooltip-legal-immunity" text="юридической неприкосновенностью"] без приказа уполномоченного лица. - Приказ в отношении сотрудника СБ может быть издан вышестоящим сотрудником СБ. - Приказ в отношении главы СБ может быть издан капитаном. - Лица с [tooltip="guidebook-SOP-security-tooltip-legal-immunity" text="юридической неприкосновенностью"] могут быть подвергнуты процедурам СБ только после снятия неприкосновенности. - Все вышеперечисленные лица могут быть задержаны до издания приказа в случае, если они представляют [tooltip="guidebook-SOP-security-tooltip-significant-threat" text="значительную угрозу безопасности"]. + - Исключением является проведение тренировочного мероприятия в специально отведенном месте в бриге, либо в пределах ринга. 1. Находиться в состоянии опьянения или нести службу при наличии серьёзных травм. 1. При пилотировании шаттлов допускать столкновения со станцией и иными объектами, кроме случаев, когда столкновение необходимо для исполнения служебных обязанностей. 1. Переодевать свою [tooltip="guidebook-SOP-security-tooltip-uniform" text="униформу"]. Также запрещено надевать элементы униформы и брони других должностей внутри отдела. @@ -40,19 +46,19 @@ guidebook-SOP-security-general-prohibited = # Должностные СРП ## Глава службы безопасности guidebook-SOP-HeadOfSecurity-must = - 1. Координировать работу отдела службы безопасности, обеспечивать поддержание порядка на станции и в ближайшем космическом пространстве. - 1. Контролировать исполнение процедур службы безопасности сотрудниками отдела, в случае необходимости исполнять процедуры лично либо передать их исполнение уполномоченным лицам. + 1. Координировать работу отдела Службы безопасности, обеспечивать поддержание порядка на станции и в ближайшем космическом пространстве. + 1. Контролировать исполнение процедур Службы безопасности сотрудниками отдела, в случае необходимости исполнять процедуры лично либо передать их исполнение уполномоченным лицам. 1. Обеспечивать сохранность диска ядерной авторизации. 1. Организовать патрульные группы для поддержания порядка на станции. 1. В случае отсутствия в отделе смотрителя назначить на пост ВрИО помощника смотрителя, а при его отсутствии — выбрать сотрудника из числа офицеров или самому исполнять его обязанности. 1. Назначить кадетов в помощники офицеру, смотрителю, детективу или пилоту; при отсутствии таковых назначить кадетов в помощники себе. guidebook-SOP-HeadOfSecurity-right = - 1. Проводить и контролировать проведение любых процедур отдела службы безопасности. + 1. Проводить и контролировать проведение любых процедур отдела Службы безопасности. 1. При приёме в отдел нового сотрудника из числа членов экипажа обязать кандидата пройти процедуру установки импланта «Щит разума». 1. При выдаче сотруднику станции доступов уровней «бриг», «служба безопасности» или «оружейная» потребовать от него пройти процедуру установки импланта «Щит разума». 1. В любой код держать при себе личный энергетический пистолет/револьвер и/или энергетический меч «Правосудие» (при наличии). - 1. Провести процедуру личного досмотра в отношении любого нижестоящего сотрудника службы безопасности при подозрении в хранении контрабандных предметов или недопустимого для текущего уровня угрозы вооружения. + 1. Провести процедуру личного досмотра в отношении любого нижестоящего сотрудника Службы безопасности при подозрении в хранении контрабандных предметов или недопустимого для текущего уровня угрозы вооружения. 1. При отсутствии пилота/помощника смотрителя одобрить перевод сотрудника из числа офицеров на данную должность. 1. Временно отстранить от службы любого сотрудника СБ при подтверждении состояния опьянения или при наличии серьёзных травм, а также в случае нарушения корпоративного закона или СРП сотрудником. - Отстранение может отменить капитан. @@ -74,7 +80,7 @@ guidebook-SOP-HeadOfSecurity-prohibited = ## Смотритель guidebook-SOP-Warden-must = 1. На постоянной основе нести службу в бриге. - 1. Выдавать оружие сотрудникам службы безопасности в соответствии с положением о вооружении отдела. + 1. Выдавать оружие сотрудникам Службы безопасности в соответствии с положением о вооружении отдела. 1. Следить за достаточным количеством вооружения в арсенале, вести учёт выданного и полученного снаряжения, следить за своевременной сдачей оружия при понижении кода. 1. При наличии задержанных лиц проводить процедуры допроса, вынесения вердикта и реализации наказания. - При наличии нескольких задержанных или при необходимости срочной выдачи оружия поручить исполнение нижестоящему сотруднику СБ. @@ -84,12 +90,12 @@ guidebook-SOP-Warden-must = 1. Обеспечивать поддержание чистоты и порядка в бриге. guidebook-SOP-Warden-right = - 1. Проводить любые процедуры службы безопасности в рамках, установленных процедурами. + 1. Проводить любые процедуры Службы безопасности в рамках, установленных процедурами. 1. Отдавать [tooltip="guidebook-SOP-security-tooltip-lawful-orders" text="правомерные приказы"] помощнику и сотрудникам на территории брига, если они не противоречат указаниям ГСБ или капитана. 1. При отсутствии связи с главой службы безопасности в течение 5 минут временно заменить его до выяснения обстоятельств. - 1. В любой код держать при себе личный энергетический дробовик. - - В [color=dodgerblue][bold]синий код[/bold][/color] передать энергетический дробовик одному из сотрудников СБ на основании письменного разрешения. - - В [color=red][bold]красный код[/bold][/color] и выше передать энергетический дробовик одному из сотрудников СБ на основании устного разрешения. + 1. В любой код держать при себе личный энергетический дробовик и перчатки крав-мага. + - В [color=dodgerblue][bold]синий код[/bold][/color] возможна передача этих предметов одному из сотрудников СБ на основании письменного разрешения. + - В [color=red][bold]красный код[/bold][/color] и выше передача возможна с устного разрешения. 1. Проводить личный досмотр нижестоящих сотрудников при подозрении в хранении контрабанды или недопустимого вооружения. 1. Временно отстранить от службы любого сотрудника СБ, кроме ГСБ, при подтверждении состояния опьянения или при наличии серьёзных травм, а также в случае нарушения корпоративного закона или СРП сотрудником. - Отстранение могут отменить ГСБ и капитан; @@ -109,7 +115,7 @@ guidebook-SOP-WardenHelper-must = 1. Поддерживать чистоту и порядок в бриге. guidebook-SOP-WardenHelper-right = - 1. Проводить процедуры службы безопасности в рамках установленных процедур. + 1. Проводить процедуры Службы безопасности в рамках установленных процедур. 1. При проверке карцера, пермабрига или каторги иметь при себе летальное оружие и средства подавления вне зависимости от уровня угрозы. - По окончании проверки вооружение, запрещенное для текущего уровня угрозы, должно быть возвращено в арсенал. 1. В [color=dodgerblue][bold]синий код[/bold][/color] и выше размещать переносные вспышки и развертываемые барьеры в бриге; при снижении уровня угрозы возвращать их в место хранения. @@ -124,7 +130,7 @@ guidebook-SOP-Security-must = 1. Поддерживать порядок на станции и среди персонала, предотвращая нарушения закона. guidebook-SOP-Security-right = - 1. Проводить любые процедуры службы безопасности в рамках, установленных самими процедурами. + 1. Проводить любые процедуры Службы безопасности в рамках, установленных самими процедурами. 1. Изменять статус представителей персонала станции в консоли криминалистических записей с разрешения уполномоченных лиц или при личном свидетельстве нарушения корпоративного закона. 1. С разрешения смотрителя и главы службы безопасности перейти на должность помощника смотрителя в качестве специализации. 1. С разрешения главы службы безопасности пройти обучение навыку пилотирования и перейти на должность пилота в качестве специализации. @@ -132,16 +138,14 @@ guidebook-SOP-Security-right = ## Детектив guidebook-SOP-Detective-must = 1. Проводить следственные мероприятия с целью установления деталей преступления и привлечения виновных лиц к ответственности. - 1. Оказывать содействие офицерам службы безопасности в поддержании порядка на станции. + 1. Оказывать содействие офицерам СБ в поддержании порядка на станции. guidebook-SOP-Detective-right = - 1. Проводить любые процедуры службы безопасности в рамках, установленных процедурами. + 1. Проводить любые процедуры Службы безопасности в рамках, установленных процедурами. - Исключение — процедура задержания. Детектив может проводить задержание в следующих случаях: - В условиях [color=red][bold]красного кода[/bold][/color]. - Если детектив является свидетелем [tooltip="guidebook-SOP-security-tooltip-public-dangerous-crime" text="общественно опасного преступления"]. - В отношении лиц в розыске. - 1. Оцепить место преступления с помощью голобарьеров и маркеров улик. - - Детектив обязан оповестить главу службы безопасности и ответственного за отсек об оцеплении, убрать оцепление по их первому требованию. 1. Изъять у члена экипажа имущество, если есть основания полагать, что они являются орудием преступления. - Запрещено изъятие особо ценного имущества без разрешения капитана. - Запрещено изъятие имущества у лиц с [tooltip="guidebook-SOP-security-tooltip-legal-immunity" text="юридической неприкосновенностью"]. @@ -149,13 +153,13 @@ guidebook-SOP-Detective-right = ## Пилот службы безопасности guidebook-SOP-SecurityPilot-must = - 1. Проверять космическое пространство, ИИ и каторжный лагерь с челнока службы безопасности или вне его. + 1. Проверять космическое пространство, ИИ и каторжный лагерь с челнока Службы безопасности или вне его. 1. Поддерживать станцию в неподвижном состоянии. При её движении — стабилизировать её. 1. Конвоировать приговорённых к каторжным работам на каторгу. 1. Следить за техническим состоянием челнока СБ и сообщать инженерам о поломках. guidebook-SOP-SecurityPilot-right = - 1. Проводить процедуры службы безопасности в рамках установленных процедур. + 1. Проводить процедуры Службы безопасности в рамках установленных процедур. 1. Носить и использовать лучевое вооружение за пределами станции вне зависимости от уровня угрозы. 1. Носить и использовать летальное вооружение и средства подавления при проверке каторжного лагеря, если там есть заключённые. @@ -167,6 +171,8 @@ guidebook-SOP-SecurityPilot-prohibited = ## Бригмедик guidebook-SOP-Brigmedic-must = + 1. На постоянной основе находиться в пределах брига или лазарета Службы безопасности. + - Допускается покинуть бриг на короткий срок с разрешения смотрителя или ГСБ 1. Оказывать медицинскую помощь сотрудникам СБ, заключённым и лицам под следствием. - Оказывать помощь любым членам экипажа в критическом состоянии. 1. Проводить принудительное хирургическое вмешательство на законных основаниях. @@ -175,7 +181,11 @@ guidebook-SOP-Brigmedic-must = 1. Обеспечивать заключённым питание, питьё и поддерживать чистоту в бриге. guidebook-SOP-Brigmedic-right = - 1. Проводить процедуру задержания если бригмедик свидетель [tooltip="guidebook-SOP-security-tooltip-public-dangerous-crime" text="общественно опасного преступления"]. + 1. Проводить любые процедуры Службы безопасности в рамках, установленных процедурами, за исключением процедуры задержания. + - Проведение процедуры задержания возможно в следующих случаях: + - В условиях [color=red][bold]красного кода[/bold][/color]. + - Если бригмедик является свидетелем [tooltip="guidebook-SOP-security-tooltip-public-dangerous-crime" text="общественно опасного преступления"]. + - В отношении лиц в розыске или доставленных для лечения заключенных и подозреваемых. 1. Отказать в помощи при самоповреждении. 1. Временно отстранить сотрудника СБ, кроме смотрителя и ГСБ, при подтверждённом опьянении или тяжёлой травме. - Отстранение могут отменить ГСБ и капитан; @@ -196,33 +206,33 @@ guidebook-SOP-SecurityCadet-must = 1. Исполнять правомерные приказы назначенного сотрудника СБ и находиться рядом при выполнении задач. guidebook-SOP-SecurityCadet-prohibited = - 1. Самостоятельно проводить процедуры службы безопасности. + 1. Самостоятельно проводить процедуры Службы безопасности. # Процедуры и протоколы ## Общее положение о вооружении отдела СБ guidebook-SOP-security-procedure-weapons-regulation = 1. Глава службы безопасности и смотритель заведуют арсеналом: выдавать и принимать вооружение в соответствии с уровнем угроз. - - По усмотрению главы службы безопасности или смотрителя может быть заказано дополнительное оружие в отделе снабжения и доставлено в арсенал. - - По усмотрению главы службы безопасности или смотрителя может быть заказано дополнительное оружие в научном отделе и доставлено в арсенал. + - По усмотрению главы службы безопасности или смотрителя может быть заказано дополнительное оружие в отделе Снабжения или в Научном отделе и доставлено в арсенал. - По усмотрению главы службы безопасности или смотрителя может быть создано новое вооружение и гранаты на ОхранФабе. 1. Сотрудник службы безопасности обязан соблюдать следующие правила обращения с оружием: - В [color=green][bold]зелёный код[/bold][/color] допустимо держать оружие в руках лишь при необходимости его применения. - - В [color=dodgerblue][bold]синий код[/bold][/color] допустимо держать оружие в руках при необходимости его применения или при исполнении процедур службы безопасности. + - В [color=dodgerblue][bold]синий код[/bold][/color] допустимо держать оружие в руках при необходимости его применения или при исполнении процедур Службы безопасности. - В [color=red][bold]красный код[/bold][/color] и выше допускается свободное ношение оружия на постоянной основе. - 1. В штатном режиме сотрудники службы безопасности могут владеть оружием только в соответствии с таблицей стандартного вооружения или особыми разрешениями в личных СРП. - - Сотрудник службы безопасности имеет право получить бронированный скафандр вне зависимости от текущего уровня угрозы в случае необходимости работы в условиях экстремального давления. + 1. В штатном режиме сотрудники Службы безопасности могут владеть оружием только в соответствии с таблицей стандартного вооружения или особыми разрешениями в личных СРП. + - Сотрудник Службы безопасности имеет право получить бронированный скафандр вне зависимости от текущего уровня угрозы в случае необходимости работы в условиях экстремального давления. - Пилот во время работы в космическом пространстве может иметь при себе лучевое вооружение при любом уровне угрозы. - Пилот во время проверки каторжного лагеря при наличии в нём заключённых может иметь при себе любое неконтрабандное летальное вооружение при любом уровне угрозы. - Смотритель во время проверки пермабрига, каторжного лагеря и карцера при наличии в них заключённых может иметь при себе любое неконтрабандное летальное вооружение при любом уровне угрозы. - Помощник смотрителя во время проверки пермабрига, каторжного лагеря и карцера при наличии в них заключённых может иметь при себе любое неконтрабандное летальное вооружение при любом уровне угрозы. - Смотритель имеет право держать при себе личный энергетический дробовик. - Глава службы безопасности имеет право держать при себе личный энергетический пистолет/револьвер и/или личный энергетический меч. + - Корабельные орудия доступны для установки только на шаттлах Службы безопасности. Исключением является дематерилизатор материи как рабочее оборудование утилизаторов. 1. Главе службы безопасности разрешается выдать разрешение на ношение оружия гражданским лицам, если на то есть причины. - Разрешение на оружие без печати главы службы безопасности является недействительным, ношение оружия гражданскими лицами без разрешения является незаконным. - Глава службы безопасности может в любой момент времени отозвать разрешение на ношение оружия у любого члена экипажа с изъятием оружия. - - Сотрудникам службы безопасности запрещено получать разрешение на ношение оружия. - 1. После понижения кода, сотрудники службы безопасности обязаны сдать неразрешённое в текущий код оружие в арсенал в течение 5 минут. - - Смотрителю и главе службы безопасности разрешено проводить личный досмотр нижестоящих сотрудников службы безопасности с целью выявления несданного оружия. + - Сотрудникам Службы безопасности запрещено получать разрешение на ношение оружия. + 1. После понижения кода, сотрудники Службы безопасности обязаны сдать неразрешённое в текущий код оружие в арсенал в течение 5 минут. + - Смотрителю и главе службы безопасности разрешено проводить личный досмотр нижестоящих сотрудников Службы безопасности с целью выявления несданного оружия. ### Таблица вооружения guidebook-SOP-security-weapons-table-green = [tooltip="guidebook-SOP-security-weapons-tooltip-pistols" text="Пистолеты"], станнер, шоковая дубинка, DT-8 «Терминус», [tooltip="guidebook-SOP-security-weapons-tooltip-melee-list" text="личное холодное оружие"], вспышка, [tooltip="guidebook-SOP-security-weapons-tooltip-special-grenades" text="специальные гранаты"], [tooltip="guidebook-SOP-security-weapons-tooltip-restraints" text="средства ограничения мобильности"], [tooltip="guidebook-SOP-security-weapons-tooltip-standard-armor" text="стандартная броня"], пояс корпоративного дзюдо. @@ -259,11 +269,11 @@ guidebook-SOP-security-procedure-search = guidebook-SOP-security-procedure-search-personal = {"[italic]Личный досмотр — процедура проверки имущества, которое находится в непосредственном распоряжении у обыскиваемого лица.[/italic]"} 1. В ходе данной процедуры досматривающий имеет право осмотреть любое имущество, которое в данный момент имеется в распоряжении досматриваемого. - 1. Сотрудник службы безопасности имеет право выбрать, каким способом будет проводиться процедура досмотра: + 1. Сотрудник Службы безопасности имеет право выбрать, каким способом будет проводиться процедура досмотра: - Досматриваемый самостоятельно предъявляет необходимое имущество. - - Сотрудник службы безопасности принудительно изымает требуемые для досмотра предметы. + - Сотрудник Службы безопасности принудительно изымает требуемые для досмотра предметы. - В случае оказания сопротивления обыску, допустимо ограничить свободу перемещения обыскиваемого. - 1. В рамках процедуры досмотра сотрудник службы безопасности уполномочен снять отпечатки пальцев и изучить образцы ДНК с любой вещи обыскиваемого. + 1. В рамках процедуры досмотра сотрудник Службы безопасности уполномочен снять отпечатки пальцев и изучить образцы ДНК с любой вещи обыскиваемого. 1. В рамках процедуры досмотра допускается взятие образца ДНК и отпечатков пальцев у досматриваемого лица. 1. При выявлении у досматриваемого лица незаконного имущества, оно должно быть незамедлительно изъято, а лицо задержано. 1. При наличии подозрений касательно законности какого-либо предмета, он может быть временно изъят для подтверждения его законности. @@ -282,10 +292,10 @@ guidebook-SOP-security-procedure-search-personal = ### Обыск отдела guidebook-SOP-security-procedure-search-department = {"[italic]Обыск отдела — процедура обыска территории целого отдела, включающая в себя доскональное исследование всего отдела.[/italic]"} - 1. При проведении обыска отдела сотрудники службы безопасности могут запросить набор доступов к обыскиваемому отделу. + 1. При проведении обыска отдела сотрудники Службы безопасности могут запросить набор доступов к обыскиваемому отделу. 1. На время проведения обыска все выходы из отдела могут быть заблокированы. - 1. При проведении обыска все сотрудники отдела обязаны исполнять правомерные приказы сотрудников службы безопасности и содействовать в проведении процедуры. - 1. В рамках процедуры обыска, сотрудники службы безопасности уполномочены снять отпечатки пальцев и изучить образцы ДНК на любом обыскиваемом предмете. + 1. При проведении обыска все сотрудники отдела обязаны исполнять правомерные приказы сотрудников Службы безопасности и содействовать в проведении процедуры. + 1. В рамках процедуры обыска, сотрудники Службы безопасности уполномочены снять отпечатки пальцев и изучить образцы ДНК на любом обыскиваемом предмете. 1. При выявлении незаконного имущества, оно должно быть незамедлительно изъято. 1. При наличии подозрений касательно законности какого-либо предмета, он может быть временно изъят для подтверждения его законности. @@ -296,8 +306,8 @@ guidebook-SOP-security-procedure-search-department = ### Опознание guidebook-SOP-security-procedure-search-identification = {"[italic]Опознание — процедура, направленная на подтверждение личности определённого лица.[/italic]"} - 1. При проведении опознания сотрудник службы безопасности уполномочен получить у опознаваемого лица образец ДНК и отпечатки пальцев. - 1. В рамках процедуры опознания сотрудник службы безопасности имеет право снять любые предметы одежды, скрывающие лицо и прочие отличительные признаки опознаваемого. + 1. При проведении опознания сотрудник Службы безопасности уполномочен получить у опознаваемого лица образец ДНК и отпечатки пальцев. + 1. В рамках процедуры опознания сотрудник Службы безопасности имеет право снять любые предметы одежды, скрывающие лицо и прочие отличительные признаки опознаваемого. 1. В случае несоответствия каких-либо данных опознаваемое лицо должно быть задержано и подвергнуто протоколу работы с незарегистрированными лицами. {"[head=3]Основания для проведения процедуры опознания[/head]"} @@ -314,7 +324,7 @@ guidebook-SOP-security-procedure-search-surgical = 1. Достаточно устного приказа, если на станции действует [color=gold][bold]гамма код[/bold][/color]. 1. Для проведения хирургических процедур в отношении лиц, осуждённых по статьям ХХ5 и ХХ6, разрешение не требуется. 1. Внедрение импланта "Трекер" лицам, освобожденным по УДО, является добровольной процедурой и не требует приказа. - 1. Внедрение импланта "Щит разума" лицам, заступающим на пост ВрИО главы, поступающим на службу в СБ или получающим доступы службы безопасности, является добровольной процедурой и не требует приказа. + 1. Внедрение импланта "Щит разума" лицам, заступающим на пост ВрИО главы, поступающим на службу в СБ или получающим доступы Службы безопасности, является добровольной процедурой и не требует приказа. 1. Проведение данной процедуры возможно непосредственно в месте заключения, лазарете брига или в операционной медицинского отдела. 1. Лицо, подвергаемое процедуре, должно быть ограничено в свободе перемещения, а при необходимости, возможно введение анестезии. 1. При извлечении голопаразитов допускается временное умертвление владельца с последующей реанимацией. @@ -352,8 +362,8 @@ guidebook-SOP-security-procedure-investigation-rozysk = {"[head=3]Основания для объявления лица в розыск[/head]"} 1. Сообщение о правонарушении со стороны свидетелей. Правонарушение может быть обнаружено непосредственно, либо при помощи средств связи. 1. Для объявления лица в розыск требуются показания как минимум двух свидетелей. - 1. Достаточно показаний одного свидетеля, если он является членом командования, сотрудником службы безопасности, сотрудником юридического департамента, центрального командования или департамента специальных операций. - 1. В распоряжении службы безопасности имеются [tooltip="guidebook-SOP-security-procedure-tooltip-direct-evidence" text="прямые доказательства"] причастности подозреваемого к преступлению. + 1. Достаточно показаний одного свидетеля, если он является членом командования, сотрудником Службы безопасности, сотрудником юридического департамента, центрального командования или департамента специальных операций. + 1. В распоряжении Службы безопасности имеются [tooltip="guidebook-SOP-security-procedure-tooltip-direct-evidence" text="прямые доказательства"] причастности подозреваемого к преступлению. 1. Лицо отказалось прибыть в бриг на законный вызов от сотрудника СБ. 1. Имеется обвинительное заключение, заверенное печатью главы службы безопасности. @@ -361,20 +371,20 @@ guidebook-SOP-security-procedure-investigation-rozysk = guidebook-SOP-security-procedure-investigation-arrest = {"[italic]Задержание — кратковременное ограничение свободы перемещения какого-либо лица с последующим сопровождением в бриг для установления причастности лица к совершению преступления.[/italic]"} 1. Перед началом задержания оценить ситуацию и принять меры для задержания, которые будут наиболее эффективны в данной ситуации и соответствовать дозволенному уровню применения силы. - 1. В случае отсутствия прямой угрозы со стороны подозреваемого, сотрудник службы безопасности обязан сообщить подозреваемому о факте его задержания, а также о составе инкриминируемого преступления. - 1. В случае добровольного согласия задержанного следовать в бриг, сотрудник службы безопасности имеет право не применять средства ограничения мобильности. + 1. В случае отсутствия прямой угрозы со стороны подозреваемого, сотрудник Службы безопасности обязан сообщить подозреваемому о факте его задержания, а также о составе инкриминируемого преступления. + 1. В случае добровольного согласия задержанного следовать в бриг, сотрудник Службы безопасности имеет право не применять средства ограничения мобильности. 1. Отказ добровольно следовать в бриг является поводом для перехода на более высокий уровень воздействия. - 1. Ситуации, в которых сотрудник службы безопасности имеет право сообщить о задержании после нейтрализации правонарушителя: + 1. Ситуации, в которых сотрудник Службы безопасности имеет право сообщить о задержании после нейтрализации правонарушителя: - Правонарушитель находится в нетрезвом состоянии. - Правонарушитель захватил заложника. - Правонарушитель вооружен холодным или стрелковым оружием, либо имеет при себе взрывчатые вещества. - - Правонарушитель совершает общественно опасное деяние на глазах сотрудника службы безопасности. + - Правонарушитель совершает общественно опасное деяние на глазах сотрудника Службы безопасности. 1. После доставки в бриг в отношении задержанного должна быть инициирована процедура допроса. 1. Допускается вынесение вердикта на месте правонарушения, согласно пункту 5 процедуры вынесения вердикта. {"[head=3]Основания для задержания лица[/head]"} 1. Лицо находится в розыске. - 1. Лицо совершает правонарушение непосредственно на глазах сотрудника службы безопасности. + 1. Лицо совершает правонарушение непосредственно на глазах сотрудника Службы безопасности. 1. Лицо нарушает процедуры экипажа, предусмотренные для текущего уровня угрозы. 1. Лицо не является членом экипажа, либо принадлежность к экипажу невозможно установить. @@ -384,17 +394,17 @@ guidebook-SOP-security-procedure-investigation-interrogation = 1. Процедура допроса может быть пропущена при следующих условиях: - В случае получения письменного признания вины, заверенного подписью задержанного. - На станции действует [color=gold][bold]гамма код[/bold][/color], либо введен режим ЧС, требующий [tooltip="guidebook-SOP-security-procedure-tooltip-emergencies" text="непосредственного участия сотрудников службы безопасности"]. - 1. С момента доставки в бриг у сотрудников службы безопасности имеется 10 минут для вынесения вердикта, всё время, проведённое в бриге сверх данного времени, должно быть вычтено из срока заключения, если подозреваемый был признан виновным в правонарушении. + 1. С момента доставки в бриг у сотрудников Службы безопасности имеется 10 минут для вынесения вердикта, всё время, проведённое в бриге сверх данного времени, должно быть вычтено из срока заключения, если подозреваемый был признан виновным в правонарушении. - Сокращение срока не предусмотрено, если итоговый срок заключения, к которому может быть приговорён подозреваемый составляет более 75 минут. - Суммарное время допроса не может превышать срок, равный 10 минутам в сумме с потенциальным сроком заключения, к которому подозреваемый может быть приговорён при подтверждении его виновности. - Если в результате сокращения срока заключения фактический срок заключения равен 0, подозреваемый должен быть признан как отбывший срок заключения в полном объеме. - В случае направления задержанного в корпоративный суд, допрос ограничивается сроком до 5 минут, после чего задержанный должен быть незамедлительно направлен в суд. Магистрат может отменить это требование в случае занятости судебными делами. 1. В процедуре допроса принимают участие задержанный, допрашивающий, а также адвокат, свидетели и эксперты, если таковые имеются. - - В роли допрашивающего может выступать смотритель, помощник смотрителя, глава службы безопасности, капитан, либо иной сотрудник службы безопасности — с разрешения ранее упомянутых лиц. + - В роли допрашивающего может выступать смотритель, помощник смотрителя, глава службы безопасности, капитан, либо иной сотрудник Службы безопасности — с разрешения ранее упомянутых лиц. - При нарушении порядка проведения процедуры агент внутренних дел уполномочен отстранить допрашивающего от дальнейшего проведения допроса, в таком случае проведение допроса должно быть передано вышестоящему сотруднику, вплоть до капитана. Агент внутренних дел не может отстранить допрашивающего в [color=red][bold]красном коде[/bold][/color] и выше. - В роли адвоката может выступать агент внутренних дел, адвокат либо глава отдела, к которому относится подозреваемый. - Адвокат должен быть приглашен на допрос непосредственно перед началом процедуры. - - При допросе главы отдела обязательным условием должно быть присутствие агента внутренних дел либо капитана. + - При допросе главы отдела обязательным условием должно быть присутствие агента внутренних дел, представителя NT, либо капитана. - В роли свидетелей выступают лица, которые могут дать показания, подтверждающие причастность либо непричастность задержанного к совершению правонарушения. - В роли экспертов могут выступать лица, профессиональные навыки которых способствуют установлению виновности или невиновности задержанного. - Личное присутствие экспертов и свидетелей может быть исключено, если данные ими показания представлены в виде документа, заверенного личной подписью эксперта/свидетеля и печатью АВД. @@ -433,7 +443,7 @@ guidebook-SOP-security-procedure-investigation-analysis = - Наличие у подозреваемого судимостей. - Нахождение подозреваемого в состоянии алкогольного или наркотического опьянения. 1. Если собранной доказательной базы недостаточно для вынесения обвинительного приговора, то подозреваемый не может быть признан виновным. - 1. Если сотрудник службы безопасности не уполномочен вынести вердикт, который должен быть вынесен в отношении подозреваемого, он обязан предоставить все материалы дела лицу, уполномоченному вынести требуемый вердикт. + 1. Если сотрудник Службы безопасности не уполномочен вынести вердикт, который должен быть вынесен в отношении подозреваемого, он обязан предоставить все материалы дела лицу, уполномоченному вынести требуемый вердикт. ### Вынесение вердикта guidebook-SOP-security-procedure-investigation-verdict = @@ -446,11 +456,11 @@ guidebook-SOP-security-procedure-investigation-verdict = 1. капитан; 1. глава службы безопасности; 1. смотритель, помощник смотрителя; - 1. иные сотрудники службы безопасности, исключая кадетов. + 1. иные сотрудники Службы безопасности, исключая кадетов. {"[head=3]Уровни наказаний[/head]"} {"[italic]В зависимости от тяжести совершённого правонарушения осуждённому лицу могут быть назначены различные виды наказания. В зависимости от тяжести наказания одобрить его вынесение могут лишь лица, занимающие определённые должности.[/italic]"} - 1. Предупреждение. Вынести приговор о выдаче предупреждения может любой сотрудник службы безопасности, исключая кадетов, а также все вышестоящие лица. + 1. Предупреждение. Вынести приговор о выдаче предупреждения может любой сотрудник Службы безопасности, исключая кадетов, а также все вышестоящие лица. 1. Временное заключение. Вынести приговор о временном заключении могут смотритель, либо помощник смотрителя с разрешения самого смотрителя и все вышестоящие лица. 1. Пожизненное лишение свободы. Вынести приговор о пожизненном лишении свободы могут глава службы безопасности и все вышестоящие лица. 1. Высшая мера наказания. Вынести приговор о высшей мере наказания могут капитан и все вышестоящие лица. @@ -537,7 +547,7 @@ guidebook-SOP-security-procedure-seizure-storage = 1. Изъятое имущество первоначально должно быть доставлено в бриг. 1. Изъятое имущество может быть исследовано при помощи криминалистического сканера для получения следов. 1. В случае затруднения в определении свойств предмета, он может быть доставлен в соответствующий отдел для идентификации. - - В условиях [color=red][bold]красного кода[/bold][/color] сотрудники службы безопасности уполномочены вызвать эксперта непосредственно в бриг. + - В условиях [color=red][bold]красного кода[/bold][/color] сотрудники Службы безопасности уполномочены вызвать эксперта непосредственно в бриг. 1. После оценки всех свойств предмета, его дальнейшее перемещение регламентируется соответствующими процедурами. ### Оборот изъятого имущества @@ -549,7 +559,7 @@ guidebook-SOP-security-procedure-seizure-turnover = - Изъятое имущество может быть передано в пользу отдела (сотрудника) с законным правом владения изъятыми предметами. 1. Предметы, регулируемые статьями 435 и 436 подлежат хранению в запираемом шкафу. Его оборот и использование без надлежащего разрешения строго запрещены. - В рамках любого кода ГСБ может одобрить использование [tooltip="guidebook-SOP-security-procedure-tooltip-limited-contraband-use" text="некоторых"] запрещенных к обороту предметов в интересах следствия. - - В рамках [color=gold][bold]гамма кода[/bold][/color] глава службы безопасности может одобрить использование любых запрещенных к обороту предметов. + - В рамках [color=gold][bold]гамма кода[/bold][/color], либо в условиях ЧС при отсутствии ответа от ЦК на запрос [color=gold][bold]гамма кода[/bold][/color], глава службы безопасности может одобрить использование любых запрещенных к обороту предметов. ## Процедура выдачи УДО guidebook-SOP-security-procedure-parole = @@ -700,11 +710,11 @@ guidebook-SOP-security-procedure-prisoner-cell = ## Уровни Применения Силы guidebook-SOP-security-procedure-force-levels = - {"[italic]Сотрудник службы безопасности должен применять рекомендуемый данным положением уровень силы в отношении цели, стремясь снизить его до минимального. Если конкретная ситуация не предусмотрена в данном положении, сотрудник службы безопасности обязан снизить уровень воздействия до минимального, при котором будет возможна нейтрализация цели.[/italic]"} + {"[italic]Сотрудник службы безопасности должен применять рекомендуемый данным положением уровень силы в отношении цели, стремясь снизить его до минимального. Если конкретная ситуация не предусмотрена в данном положении, сотрудник Службы безопасности обязан снизить уровень воздействия до минимального, при котором будет возможна нейтрализация цели.[/italic]"} ### Уровень 1 guidebook-SOP-security-procedure-force-level-1 = - {"[italic]Вербальное воздействие — ненасильственные методы воздействия в отношении какого-либо лица, направленные на добровольную сдачу и содействие сотрудникам службы безопасности.[/italic]"} + {"[italic]Вербальное воздействие — ненасильственные методы воздействия в отношении какого-либо лица, направленные на добровольную сдачу и содействие сотрудникам Службы безопасности.[/italic]"} {"[head=3]Меры воздействия[/head]"} 1. Вербальное обращение к лицу с прямым приказом о сдаче, сообщением о задержании, указанием следовать в бриг и т. д. @@ -732,7 +742,7 @@ guidebook-SOP-security-procedure-force-level-2 = {"[head=3]Основания для применения[/head]"} 1. Применяется в ситуациях, когда предыдущий уровень силы не оказал должного влияния на цель. 1. Применяется в ситуациях, когда цель представляет угрозу для себя или окружающих. - 1. Применяется в отношении лиц, отказавшихся от сотрудничества с сотрудниками службы безопасности при проведении процедур обыска и следствия. + 1. Применяется в отношении лиц, отказавшихся от сотрудничества с сотрудниками Службы безопасности при проведении процедур обыска и следствия. {"[head=3]Рекомендуемые случаи[/head]"} 1. В отношении лиц, ранее скрывшихся при задержании или обыске. @@ -757,7 +767,7 @@ guidebook-SOP-security-procedure-force-level-3 = {"[head=3]Основания для применения[/head]"} 1. Применяется в ситуациях, когда предыдущий уровень силы не оказал должного влияния на цель. 1. Применяется в ситуациях, когда цель представляет значительную угрозу для себя и/или окружающих. - 1. Применяется в отношении лиц, оказывающих агрессивное сопротивление сотрудникам службы безопасности. + 1. Применяется в отношении лиц, оказывающих агрессивное сопротивление сотрудникам Службы безопасности. {"[head=3]Рекомендуемые случаи[/head]"} 1. При нарушении норм экипажа в условиях [color=gold][bold]гамма кода[/bold][/color]. @@ -782,6 +792,7 @@ guidebook-SOP-security-procedure-force-level-4 = 1. Применяется в ситуациях, когда предыдущие уровни силы [tooltip="guidebook-SOP-security-procedure-tooltip-previous-levels" text="полностью исчерпали себя"]. 1. Применяется в ситуациях, когда цель представляет значительную угрозу для безопасности станции. 1. В случае, если нарушители больше не соответствуют рекомендуемым уровням применения силы и/или сдались/прекратили оказывать сопротивление — необходимо немедленно понизить уровень применения силы. + 1. С целью подавления транспортного средства, включая сегвеи и их аналоги, а также шаттлы. Целью должно быть устранение мобильности, после чего уровень силы необходимо понизить до актуального. {"[head=3]Рекомендуемые случаи[/head]"} 1. В отношении лиц, оказывающих агрессивное сопротивление при помощи холодного оружия. diff --git a/Resources/Locale/ru-RU/corvax/guidebook/corporatelaw/articles.ftl b/Resources/Locale/ru-RU/corvax/guidebook/corporatelaw/articles.ftl index 8928ce2d8d..8ed009a4d5 100644 --- a/Resources/Locale/ru-RU/corvax/guidebook/corporatelaw/articles.ftl +++ b/Resources/Locale/ru-RU/corvax/guidebook/corporatelaw/articles.ftl @@ -22,6 +22,7 @@ guidebook-corporatelaw-112-note = { -guidebook-corporatelaw-article } - Побег, попытка побега, отказ, помеха при проведении следственных мероприятий. + - Попытка завладеть нелетальным снаряжением СБ, не повлиявшая на успех задержания. - Нарушение норм экипажа. guidebook-corporatelaw-113-desc = [italic]Несанкционированное отказ от работы сотрудников или призывы к забастовке с целью требования от командования станции выполнения условий забастовщиков.[/italic] From de8c80e2c46d8796fa11730cbf3095f9ff181ea8 Mon Sep 17 00:00:00 2001 From: _Svist_ <148935188+Svist666s@users.noreply.github.com> Date: Thu, 10 Sep 2026 23:42:47 +0400 Subject: [PATCH 3/5] =?UTF-8?q?=D0=90=D0=B4=D0=B2=D0=BE=D0=BA=D0=B0=D1=82?= =?UTF-8?q?=D1=81=D0=BA=D0=B0=D1=8F=20=D0=BE=D0=B4=D0=B5=D0=B6=D0=B4=D0=B0?= =?UTF-8?q?=20(#3726)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipped-INNERCLOTHING.png | Bin 1014 -> 1138 bytes .../Service/lawyerblack.rsi/icon.png | Bin 458 -> 498 bytes .../Service/lawyerblack.rsi/meta.json | 2 +- .../lawyerblue.rsi/equipped-INNERCLOTHING.png | Bin 1119 -> 1113 bytes .../Service/lawyerblue.rsi/icon.png | Bin 499 -> 474 bytes .../Service/lawyerblue.rsi/meta.json | 2 +- .../lawyergood.rsi/equipped-INNERCLOTHING.png | Bin 1102 -> 1097 bytes .../Service/lawyergood.rsi/icon.png | Bin 483 -> 492 bytes .../Service/lawyergood.rsi/meta.json | 2 +- .../equipped-INNERCLOTHING.png | Bin 1027 -> 1122 bytes .../Service/lawyerpurple.rsi/icon.png | Bin 477 -> 528 bytes .../Service/lawyerpurple.rsi/meta.json | 2 +- .../lawyerred.rsi/equipped-INNERCLOTHING.png | Bin 1113 -> 1110 bytes .../Jumpskirts/Service/lawyerred.rsi/icon.png | Bin 510 -> 476 bytes .../Service/lawyerred.rsi/meta.json | 2 +- .../equipped-INNERCLOTHING-monkey.png | Bin 1080 -> 1198 bytes .../equipped-INNERCLOTHING.png | Bin 1383 -> 1266 bytes .../Centcomm/centcom_agent.rsi/icon.png | Bin 496 -> 476 bytes .../centcom_agent.rsi/inhand-left.png | Bin 644 -> 488 bytes .../centcom_agent.rsi/inhand-right.png | Bin 620 -> 494 bytes .../Centcomm/centcom_agent.rsi/meta.json | 2 +- .../equipped-INNERCLOTHING.png | Bin 1091 -> 1265 bytes .../Service/lawyerblack.rsi/icon.png | Bin 452 -> 482 bytes .../Service/lawyerblack.rsi/meta.json | 2 +- .../lawyerblue.rsi/equipped-INNERCLOTHING.png | Bin 1223 -> 1268 bytes .../Jumpsuits/Service/lawyerblue.rsi/icon.png | Bin 493 -> 465 bytes .../Service/lawyerblue.rsi/meta.json | 2 +- .../lawyergood.rsi/equipped-INNERCLOTHING.png | Bin 1191 -> 1271 bytes .../Jumpsuits/Service/lawyergood.rsi/icon.png | Bin 473 -> 484 bytes .../Service/lawyergood.rsi/meta.json | 2 +- .../equipped-INNERCLOTHING.png | Bin 1133 -> 1176 bytes .../Service/lawyerpurple.rsi/icon.png | Bin 455 -> 516 bytes .../Service/lawyerpurple.rsi/meta.json | 2 +- .../lawyerred.rsi/equipped-INNERCLOTHING.png | Bin 1201 -> 1284 bytes .../Jumpsuits/Service/lawyerred.rsi/icon.png | Bin 494 -> 470 bytes .../Jumpsuits/Service/lawyerred.rsi/meta.json | 2 +- 36 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerblack.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerblack.rsi/equipped-INNERCLOTHING.png index 41246ba8c18c76f7e529bc60e3d88477838e189a..106b83cfb43bbaa6cf6f76771c07e436d8dc0b8d 100644 GIT binary patch delta 1117 zcmV-j1fu))2l5DzB!2;OQb$4nuFf3k000CmNkl`^nc#Wtlj_ygTY`h7z~Dw zlOdJHV{Va0afqkSUSR6hHF0ibX_bHf-B+-fjeqwVO4n4?2Y{)sr*ZL%&&2ne>wluM zxBvjk`k5P-%RaZyS=gynQLoo={pK9b7BAqSv5l4GS$Lj@^W&2UTM=Hr-Ws?QNS}DK zR~Mfh*At&r^?yIf(rC;r3UQ0sc=+HkR+eYQ%|Cqb7#6bu0QNacJgGq;>l2RaiA_dT zzpn$zWuH5)hp-h1;mYCy)?TgSZ1DotUah0DxF8G(TM-=BL%Hk^#0g3LeyHl7>DS=s za9`}3&0U-yp9Ij(JD~J-53K!U;nN@f5RpLVos^`$#eeLsrw+7JB8o$0{hql(c^9@K zG@H8sARO>!ua0s5Thz9G7Y6OrssMmOp#(bbB>h2}exXnT&<=HiqC;+zRljEnkQbZH zUBq!bB#Sw&hs}-oj?f2yIF5(NkdsD1nm!S>BC*M+>i0|mdAOOnb*=07e}4NCS08of z=F?{{0DrX8{l3E> zVKE!SBcq@(nR?meF#yDItaNjE^?_2yK97FpnSWqf-lZ`-GOA@Js7pUn1ju2YoRZ4u z>I-!0XL7*XoN9Yj`V%70(vA-Ih47&J0G;~EhBC&E4KE#?--o7eFc=I5gTY`h7z_r3 z!SM0H7~^AZk&n4WURhe@K@f2I{(ag206`G&%F?Q^CyxzEuaFpHoC=S?yG06He^+t+ z=6@VEH|Dj!mST+Yi=Y39mE~FZ6YWB+T%Sy#eNgdhjPEF@5JUF5P&d za=Bbwy72_lcP_)9m`q(9(XW1(M9Bg4Za!>9*r`>;vEzD}xqDkl_$18Sy^X)-d|}g0 zttyHlS?dRck^|Dp&2qW?ps}qao`-|RHh&z~!_`OKrSaoz?1hp8fOj{X7HXRt^QxCq zCQXBE$-0atH`MC~LBMD3-RF!kUM~A$YdpWAeI#f+ztW+}7~?bd?hCsrORGvYD31ck zCokumY7d+T8i|Nx$ZM+(%L1|!%{EmsJAj`4@W`mB$IBE7B~~0A z?t?MLbwvS9bmTPwX*K}JY=iRpfMh*h-V?f_K!**dVts&48&1Xg0G&3RiuD0HZ8&x7 j13nZR3l=hZqNOXq>u)`~xlp5z>N7rKsTIqGX7YDRWdRNSj5-pi37)vKv96V2pzx zge;Z})|PCad1qdHy?jZ(OYU02-4DX$yYIgHz3+GL?mq6lQ-5GNoB&`soB&`soB&`s zoB&`soB%3~W3iZrWu;PqbUGcP`f9c6EiW&N|GT@pAut5azj!0numAM12IKMv768ek z(I^}o90>A8qv0i~9VaRj3Xn`DyKlPytyW81lL7oW9U{p5 zWCH@dQRY?U599%;e!JZkgz

)Co7dc3+g}evLONm|1!&45IeB;K%QWX0xfxKT-g4 zJt8NN>c1a+hO77f&Hco!ny908I;MgjKOc2I`ux5Me}5nkz)rirP?yl-LY%+-9%x}? zZISTEIjaKB-|2LG-5%@5;U6hLKA(r|>WbKAy4&6%BE-wpIe1vvA9!widt2-jxHzt_ zufw>Y?N07Tp8I?N5XE9~!0urfDL|JrH0lM`Hh=k!2LDEw1jG8FLBOejBh3c|ag^O0 z%3p%=T7Mv`ZyNGiFzI5eEPy=Xqg>Ghbn^!m02d%6!z~Y8&adpj>n%iDVTxbL1K8*8 z(9)zAnBWg20I5H03nH-lTD`y|f6(s$vA6mWQi(sdKxv%}Smct1Emct1Emct1Emct1EmVd(u0G7iE0G7iEFwR4zQb`<2V1N_@ z7qc^`PvneXZ~u>n!H;^qF0L^ipxTGB02r^!<#OUb9#WReWnswd-5NkSeLO;BtKQy= zl!*Lfv)TU9*fsr(?AY6O@^nx@~YLLSQ+Z0AM++7vL`i=7p{+x(xFG O0000-1M&lqB!2;OQb$4nuFf3k00053Nklz%>Co@sw~!7lq6jYHCg>L^B2I$n{kI#i)UXmhlkJcpXvP^)+1 znBS6nxtI6ey+0R-iHV7cF(BvWl@LOe&#%?+`||m<5<;k)n}1j1z8%MuiF3#G2wi%`JEha8Q9e7xaXpGh!HAv?+RY+_PypHNEOy!g`WcyDSROcTHlG2I zQvQDverNRYWKB!&CybQCIZviC05qG=WV5pX^twI(CL;)jO&G{_#M#xR6OqGx6O4Mm z5_ZJNIN78O+BcykY?7%Aj_c8G1=wkeb}JZ>0i=|=W>NJ@kaP1Ytov^yQyEPD30fH# zPIEYd-|?4T&$xVvndW^BN1H&+2nkKn29f(#fc$nYA_kG~)u3BC3bz3O` zi0ny}Wf+EVT^F!+k)|nM*V&`?Q?7y%03Dj=IWNECIDC)ye1FC*l|Ol$V)N*UgOGm( zpmMYtfCw%mvVZ-!c*WlNckd_1FMLn->kWX)Sp{Lu0NW?e5QEwD?-ig9%puCMTOgq zW_|`E$ppQ2Ih!-zyn7Ex)==45VY(-)J^&;KyAkV))AKupBC?zN0Kly8x^Z-P!c;mX z>=tu4{P`7&y#ok!oS{@e#_U14QEq z0O$QKcCiJ3x2I8GlCQpX;Jiy1r+){``Zq=Z@jd_;r}jRV-P}i| z?xSyiWc9hNT`Qu%N#7p`UWo?1X22f^deXnq0mO^tQXcwYv5klkfwb9f3w;344~uQ( zQr>pGSDf?-dd;9e+j&O)8@m9VZeI6cB$>GK|K7BMk=3i$W#(r906PUAKI}BL!L>da zXs<((HGk+RGU+p~0|3x)E0^-UXLAGy+MV_oCl)8YD=v27e$3GAApY5}k9c z#{i(C$n#FIBvde z`+tkE?Je{SjRSx!Kk1Z5ya}evkR)qxDpcqh8b@d@jf_-hxt%96QXQeWG=Yr4Er zcb#bROr`Fl^$1Q?BdjTTCI)lSX%Ji7meE*Ya=^mmC^lB6u(2|Q ze;`Oh-%6L-kCWpgZuJ4YY+$YrXw1i3w>`kc zG|4Fnc-ZhD>H~P%@F3~~c-rt_>H~P$@ZjnL?u!iqfj}VmANU9N6{5GIOpp`+0000< KMNUMnLSTXzD+rDN delta 1098 zcmV-Q1hxCw2;T^hB!3BTNLh0L01m_e01m_fl`9S#000CLNklMlXe}he_C2*;5eFgAz_83ffcjN63220hl z_?jD#OeR^K8z6qq3K0tVxeWyJ#zJ0Mep4Pm>c_t&kp8(0zwaz-BR3q(mE?Y}Z>+%G zvxLUxHeA^n)?qGK|LVIYea&rd7k?vEgHrRbm!Lm%;`@T`fgO1- zg|L;~BBXx_ihBWVIAVP}!1>ZSeiES?NDDxurRv)uhSmJ01)vRx$mqx;mn&8xYmAoL zh%ALFekl(i5`F}hD$`I075t_I;Odt;f;gzZQGbCKsN^>#fN{3!h#PE4V>hO9P57~5 z^%79YZ+Zy`lQKiNtEG#Nu^g)SrB4Bs54jWk&W#Xk4o3jk9F736IUE6Cb2tLP=5Pdn z&EW_Do5K;Hk}r*ojj>A!3XoFZ!o9nGNA3tRf7Ue$e#GP1dm@Sl$j%`x0LAMbJpaHx zdw=Q{F*=krBzd|U?XlRl2$AsnwU)PUSmfvC{iqQbsU#vTogpH|=_zQLHDDZ(;bDZ% z_h^yy52Yf68uw~Ro$FNhW#dXbFLwY65+p?MxEwt^zow>}S{5#EZh$TTRDyC6h|73r z-5#=qXRpXYN&vcb^|W@B?4N860Lv>-34g}1ktx|P8y&Lj6tFreq7*i}e08w&82obU zFB;~c6vT1ig>~~u3-JEcBUbVqSOg_Zs0MNPeMj=z#I(76N4uovlNR9Qx$Aj#F2tR_kV6e_C-{dh#@UN(Rh5WEruqlKqV+C1DLUFzN+&BL~K{Ggq1ebOhbNv zDjRAlKR|^IHIW~n(uSJI4^U}C&EyBDvZ3bk1FW{exeAs=6vzK9ZVkZ@2xJfk z?*gSrD`c=sHwR0*hq<6;W|h{f?DpC zj`v&cF8A`@yZ^m=fI^{AC6ydf zk7gJQCn%hJV=$b+AI*^7r>HKV85U!(S9;-0lX!}6qmFjjJ{rzU;uDe`^>E4eF~%+&~%;&a%fGt2I(u%bPm(9 z!5ofo9l^+J2-nfh8UX1Uq#KcG*-{Qo%O*7rrB!3BTNLh0L01m_e01m_fl`9S#0004{Nkl6j%l?)Zv zn0L*Uh^^eE)h_v#%UvG#e(&E+V9bgDB7g`W0*C;l0Or;TE`P0+!)@rg9^>b=TFu=& zIA`CjdNl?K2?LOGZ6S;IwvFYL94yOnQ7i)GGSag%P~%l3)wE|>aAhDumEiiS0>dzH zWIkix--neD0FRzTQC{3UK+`njQd6*Po9(;N16@1uEC>P6rRIwT=e3E|+&Vj>nwR`l zjVrj_eS)&lKz|~YVfL*$gd_yOopZ5hyQ71#xRinLR6G4`ge5%%VVsN^ zI!#SXFmcT=aDQxWqjPZywp~Hz;u4O{ZD@v3y&jFQH`OS3eF{ks_Tv%Nuj_!h*%^l< z2#TdL6CQ0Xw#OG_KhtwW5qmYE^NQuXh-*_nnop;o^hqWX1*z-i%#9j#0jPhUK* zwsQr9FOF!f_FZ3DWsyMd`&(-DHN&{{)&aoUwNT9Gg@5(0jR5L>04V13>^zME+pf6Y zKHskqQQ)N?)8m(-p;#&-rpE*6U+VzsMJtoVaylKNVpL$byUP{&0I-}+hpbH2b$?L2 z^eM$snf-V~^{;h+c^1KZA%tAti0AcJvmZRq=lVu4UkJfGi+Eo5ORYW)@2jBKMf8Qg z0|2mavwt#KkmL}6KiVGDxB0i;B?*plyDhkO8l6WwNegP<`Lt8cU@d z%`jXdSG8-$Ya^)DC&?iefpp9V(f9o&s2K)gdK`33)}j%%=JIV>c2WDvg0l2|MSv^JqgT(YvgQJr`a*L6@PB8iiRp2i7LM4F7nU^#$j}!ylp5lN zjDP&L=_?cpg+ifFC=?2XLZMJJJ%M(F=(g0C=mUgF2fjUf92!fdoSWK_p;`lLo6fm) zh`~~|Rv^fhyzgysDop5BGyv@G0~`Cm+NQHL{t`Fggt1i0+4}Jd18bX3|Aq+wEI)a% zbAK#kgHUEjGmJ~SvLr#!zhOe3e21Nb6OqRSV&~ul`s6$GZ0qQp9imfFk4ouXHn?F1PK9ka!SmyK*Td&m)?W7jghE z>J@6k-Cd%O6UIw}+7cu+CNyF7PA@uP(tiN}I5xNOu)N38;{cFMJwXq-FLe^!vwk|6 z^k>$#GFg0$^x)p;BLKj;b?7SLtA~)W{1Qmv$DCIsN28%D5v4ZdrDcbC0p1CGT1s>V z4uWPFtXRs+Hc^D@17dod<>PrsatNn|BWd*kvTP8p52($@^GDgpu%RjH17zCJ6fN}u uGHqy@`T$urG+lkbZLvY2P$(4t0>1&k7?wXkiwdm(0000GV z5P1k`v$arbAqb2PMnys%Ja|&jk|^rnB?SorLA>o%3L%g{yA%j&Nt>8Ldk}U5O`|Ud*+%`W7D3N%1QMT@GW=Nu;BF@pkr(WKTERuH z7hi*6#IBU33=p5QLIgcOw}C)*=y_%NO?d#RA6^J!YkeI}w{Nn#&hp=w-AJ2KYt5f~0f)T$Fa^XKv0PcF6oP(?G_xUjL@*fmFSI?~4mSnAG|c|8mK%tQ-dl z@MogmHGenJpRxUUUmx3Zdh8DLxONASH!_XG7a<(_z&ub~6hbz;MM(b>OnVn-lNav` zfz-P|D~X>($OqB_=vQ34FN7FY^P3icUMxgL|G3EIj7r{*UPQ1Ms`#ZmfJpS8AbqLQ z3smr%5`e3p=@Z1k+O>XGdx1)RQv&dBs}UhD>3_%7w|Wbx5N&O3 z@qeH9J6U2xS8NTDy<}h{hlsRvhKLw*qo8G16%d&Y!C%(`cQ6=_Mx#naaJ$`cO3G-R zew{iJ7j2Ra$jV2Cl5shjJU^ypC$$S9%zC}h1b|9-HIBN)5cCVdvsYvxB>){j@&JSp zZZ$VyetsS*K^*#6pa>;#0W+{VDIyc}E`OgdEd302`+St81(hI<;QJ}d#*-GnUvrI> z6npQ%ep(wPOsEEN=+k6)9s#spm1MM7T7cGX$vy5#6k@UhB}|M40#FI!h^&22aT9tx z+Cn7llHG*T0vN^P)$ja&pri~dk#~N8h(aYxSZPDimZf167b|EGvCML#$n(OMSVH}P&SKssxT+`s5^95N zc3qdt+d7+F*9o-&fT}2LlQ2$Tf{>D@n>L&E2IKK7oAm}yH*JKJwypqJFfodrUK9k& z&prBYNj@I#Nv>^i_}(L`mpO6P>2}Xed|OrEu6Y~o{YP(V{jN8~IDz3P2=}U@I7$VK z$FCfvg7Ea;?SD)#YC)&lJzq&Io&ls+Go+VNh=Snb<%NCcAPnq#9=_*s)ojk0CSY8F z>sITB)8mUvBfGyy*cb~b@x4JP-!)HAd%FPm-r!$1!DzA7-0Cwd!<%T;w8 zEu@?ZGE25;gK-Oll;lfAR7Eiy1&CaR;VAea+hWv$noH~Ie5q*UFkdQKJ;z2Bm@0EF zGt=%rvtTs?Ksf37QW4)9gljag%?w!G*=QoaVfzNe#KZu60?9C~NkX2~fQ2+n{ delta 457 zcmV;)0XF{Z1LFgbB!3BTNLh0L01m_e01m_fl`9S#0004%Nklw*t?Bt*hqTtZQtU{r5>skcCH7+{UI#>r?ic1_i2zGX{T1BeR-9d+# zd-OtDE4-Jabjc6l@-9d2ySw+^1jeiwAO?s5Vt^Px2_SEp4u9F&QU)&vy9xF$99Nvp z$2;+UWLXI)NE(2Wr&rSGe0HHN&H!%G<;E2rRyV|2`_hq|okkv}qXH3V1W&h3Od4~r zZ5vZA0Ii`RkfZ>(dJh*~kg*a3b4WU{d?zoDLQ00000NkvXXu0mjfDaFOF diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyergood.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyergood.rsi/meta.json index 3f112c22d3..25e7f40cc1 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyergood.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyergood.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/305131e20cfe53eb41de61db79a99aa12c2925b0, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/8ef1b863b67ed708de551bba5d550b2c6f1d24e1, monkey derivative made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerpurple.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerpurple.rsi/equipped-INNERCLOTHING.png index 4ee67801d72c16b74e8651e76b42dedfc51536b3..28700624ebed65748e4fc72fb8c5375ff43cac07 100644 GIT binary patch delta 1101 zcmV-T1hV^s2;vBkB!2;OQb$4nuFf3k000CWNklpmm<3Sh?b;jA4raQ@QusR=Dc6Ty6-#2gG{vq!H3V(${p-?CkiocTqna(k7 zls23?=4Kag_ufr@ZEk*%E&o<-X65m|ylKP$;V3>KDNv8k+VG=PsS0sr%B44Z{X81$6;Xeu zw%NANPHnR*{f-VW%sgeQyk1!2?JNqWCdXW>4*=_hHGdu*y+%Ph{lU;M>bnhBzxr+i zgQ4NB^gB9$4Ypob<4=7iKBC2O;ruy1dDedS-pv8=x?X6fP<_$DH&f8Z_9X%P0{ zlf6y`ahy(it-pKKm;Mf5p#}h!wSj2#I6wc|{MeW80MQ0f8<77FI3m-z;nX1-AbR|3 z^CSN~D1RDG9bppTT4565d(pl?n2ukjdNNB1A$(hX_sw;#C$n@qemRg2p;mo%+}b9q z?>PdZp%}Cw4GU-Qt&Jt2ZazqpTBsC ziNrWhTC)7zjDE2%|Hz0r!>P$JZp(%9=ioR_a5fM^=<2K2)V6JE+cu49qco|#Fp(Gs09U<0?#6XId0Ox#BisqL@=u-?kh^i+ zRg(Y!6Nz!m%`QldDdhl0xv~Xwd4;FQm=l7&4QBL<1I1F+HTl8NFwEtZu4@vya)5}K zF83=V+==zV+Ak^jUg+5YB1;eM_&Ho(G=HSB!vJvm)_s1=(&KC;!XyI6as0Ec4Pg>- zt-NJz007M8m9EBp-?Cke*)hD=PJnF TfOM6(00000NkvXXu0mjfzEuy= delta 1005 zcmV_rE>?t2)cA|aVTyb6|A5`Y27lp_z#pohi*b?Lxpy6C`h4H zyToc!QU|GsO6u>$@Adk8n!9*s33tEc-n+YZzwi6q_b%amUwa$yz6qg93ewsexR+b&F|mc-Sw|k`K1MT z`*FECI+&w_g9GpW^V*kcS4WCAer!^?v{_rMwbh$<|8_>Z2w3;g@Th+;IxUK!$}c4V z79Hrn<=-dMDSu+;(Tc!4-690}0nzF6@YfX}NRD03-pNq$!?G^|?$O_<5i0yLP~n$; z1y)u+c`d&J!3aP`?RmQ&d z-DmJP=Ht2ZMnRB&dwZJ_iA3mJh)}6il=-D201M$1W`DJ@+e=GJUJJ*$AM-#=n!)_I z7I&ZT`AksduPeaT&+@5bi;Ig5J*R?3*O7hhOabbJ&)C=)Ei5c3KPQVu*U|nn7zTtr zB0xMBE(!?u$=*qtTAiZV{#lw^pKEw6B>_gdM<^XnQ#goy#10X&~H!X&@+ zE5M7gAz`6r;@vmRulzG;(#ik9@4g6;?Gl;`;52j15&d@Qbz z5^38|fMEyPen-`+F7R08`q~EFUY~L)Pq)`+eQg8Xom$nk>VokV09^FWV!Kv#>Gt|) zVdLjh7jSWT9e>-p3*}P&MfKx;Qxj14c4z#9Ljc0RQ7mHn(^i~Z@B0Ub)VmKVDJkmrBzI;uRu?_t~Qb(vro1@mr~kU=mhTM;CUkL)Z zAKenk&?-4tT)|G^v&zopIO(_Jz3)Ho*sf&a=e>NL!Efk>)2pND&w#hOubg>@#Y~Yu zcb5~_U>M+^e>0A2bOk!O3C_HOx4LiqBQhGo!RRKo7c<3)e!(z!<^MmdW&j{NmjfOv s4TeFyK2Q86GcYdXU)Us0NJ!8;09$jcwk>%x%K!iX07*qoM6N<$g8I4nn*aa+ delta 451 zcmV;!0X+VY1lS5XYyO zOC%>TT9OJ?@d3Oj6ha?Ch)BKW-p9$Qm%KrqAQuS~^x{=0h@c786;GkPw8YG&(}M)u z%?G{Yf5_~|Wac-s$ttj8wE!(Z3(x|z08#+DuBT{y-v`UGI)AhthGA;kHXk#_Iv^oo zfQP4PdVg~ZtJR9nUtVXaanyzQYYr@$=fM<(`wg!K!Vsm7KsUQU$mJ?#X3l07)k)-deeaZB@$$Q~MZ7pq_TXUTFeoBZ7&>G_HrlJL zh@r+rvP1h`lNvR@tQm8@50w1r%lrQF%kRBB^7{b-fj}S-2!8~Et4Rl?vD!Cm?;O^k zzMsY8N2C1O`Nb7G|Kus;cog|xUr2pY^#P!Jd<;W(@9^^*#dRDkEdu~q-*@Ag{z1Dp zW+7h&K79X-TLZVz+1UldIKuYUCLY|p2Q>wh^av(?d~LfEm_9?>kMeybQRDkm{cC<2 zseQv-T#iREJ%9NQ+gqFb=BFp$L5|lA>Wx|aNwo{7K0`^=_|FMd|3U}M^bgufqK1+l z;lc+?%P6cC(b?IB!fFu*OUvAlk{*GQs9~mmuq{q#)xQX;{)Gz5gtQeA(T;9kl8@L*I$E9}T2`t^=6&0bu8_8GmXl3Jl|jKmAW{%C2_phypMD zv}B%&hLRpZS~3IapX&hT#X{ABw)d@ri7^5BIOYm{0MPcnbrh-wO0=`%`tg#VmS z_0Jtx-Q#1x-8)bLXpcru{lAb)@h9&@eLq{jzPJv&{c@oZe)a1Ut$Aj9IUa?!N7E;- z0|4-FD}PiiWP9p9WZwQ8>j0+jB&fcx*C2z9FDCZtq2W4q&J$ta)Gt&m*EXoWZ*M8d zj4j8bE|Ig2TgPiVXw}d5M0f}*f{6Ex7w)Xr>t#I1qbkdI@bf0j~`8GGlt zj(_c~O-u}p)XzEclU{km^B`r0jd&JE zutE*LkQ~6i&6o5D^5y2SlBhv@{(>a@Cuq-K;N?`3+mtUiv(tX_2Mm$}ywc6ibh%+1 zk;H>w7)QJw!K-S7nvy3u0BGK@SE$LyF@I`zWV|$(Eq=>roRA!#yqyvkmIqD1?1okFkw1zx2J4_w| zt$DXyQ{s7g>I@tNIUeOT0bVyxgSA;<3d`0`W}a3kJgCs2zr>z2 zg%0Vq2VZ(fh4u7$-?;M}pZnG~Z)aAPncrph&6}OyH^2F2=6^BYw+|GD7625776257 z76257762577J#R5*TJI}mX}77kVqs#w0>%8${KHNC%^lb7D6BiEdS}VXPo-)U%x?6 ze%}Hhc~i6w7R@z6J~uaK_4M>WUtb^8M-M}Ke-#{w)Ib-2B|`+{kJ=mv9PGI3J$;Am zc=&w@KnG9pCVx2$&CSg)Jw5F_Q(!yMBDnd%+}Q@jCnfMr!ma{Pw_}MGA3cR^JPxr~ z46@lQY}n7#0QP?(L~!#{8xZJ?ZeCt~Umk$!f6DxY`G4!s-f)c6ku`Uso|Nc**9PNo z<=h82SzGP27llIng^-;2&COp_0P1>_oPwxsyWvFlA%A#zcZEEUb)Z{j55iwm zfLL!gTxf5Duzk#=5{Yd@i0d6SkRHqJ_}{(v@5o89gqx#bKv2-*4*N+l{kYdYI{}D` zPaZmU_kZW@_Ciqs48sT+MF#M8XpO8nH`s54QsC7OnFM}EF$?k_=h zFTlaG&*cE+n}>D6k0O);ZUNjg&OVnz4AK0)1;7mm$?(WSmn&34t=-PvfN&!M!H~tz z_0w*FJus?1A3dZAU-3&+vCS?Hd@Ah6OIX{3!xsoMB+E6k10kUkUs6G4u z88%czet=9HDk48XrVSO7A0W$yipviWZG*lM0>z;P0L7ua0RI70t*kLkWR0Hy0000< KMNUMnLSTXp()79j diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerred.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerred.rsi/icon.png index ccbaf16989a364e6b385372d63893bdc44194137..1a74b3394cdc4a3154c6c64017dc0bbd5931b262 100644 GIT binary patch delta 450 zcmV;z0X_cy1Kb0UB!2;OQb$4nuFf3k0004&NklX4+t_c8?v-x7s~srVUmrlz&*0}Jo-C#Nyqfu`{R~2d~egTK4H&YH) zoi6%=5fX_j^amrXI$a#DQ>s9!z}sTq{~CQp+Pfz$vVL{}b6X1gyDGTuCOrMe%i?Gs z4;Q=}&9uP)pnrNTA(z|&@GDZ&_5%Aq{`_$H%^jD!0{;blf7Q75okalP-vG;#F}Eem zZ3z#Li?DBb@<}&=Bw)7ooo;zD0O0xFjf{8e6i6P>RV9)nZcO zCAXN{$784phD+Y4gomgodt3pFvPXJ|xGFGPJ3wHt96PqL`%du!mjM5t8o{Xor`tio sptXMGFfqjgq&o}jAEbDp0)c?WA0I8Z+D2nr^8f$<07*qoM6N<$f*rHYbN~PV delta 484 zcmVJ~cc;|*F3Vep(@ z?;O4I`XSt_mdpDt=biHo_k7N|KgKX(c>o@O2jBsC07?L?hL6<^gRQEN1@w6ctHxooG?X=E}PM6?-{#{Gzf14se33PfL9aGkwE zB9TC`SnT@!N(w-9PogesCucC@al~RVn5K!A<5QeOc`8$o0-!~oj2BeiKagCU;~4Mx ze1xs$jDPz)j(@GSJQjizoR4}{W@$M9QCx_-Z2%9))3`W#V?THJ%>OvgfV89lXq=n= z5Z?egghKm!k5~_fzQjcSPytAH)+<98Evp;bIS8PXvwq}3K?6NRx0g-c^FgEx;64jf z-0lAh!1s>bem^kM0JQ&9jIJD=gWoKIPM-4ysGI|(30-KN=a#NuFI$1y6r=z|_ta?= zfu4EvpYl|uAO*lz&{?!yr4wwl3kqu(R`(42$rgx31&A26d*rHbfD*tUMTQD6YLu%54LKEs1lY{A{7n?v%LcSPGn?qBS1`5V8ZBI^0noAOb z+y;6mq)=Q?MTu%uSUdhB(_OD+T$Aa++RaMZb!Jw(rZw|}0e|gd{k~6cMk9IO02~g7 z!{Kl^oaZw#JPdz4N^-dz$>nl-JeSK6e>_Sek;tCt7YYTUsO$PD6bkO^YvR%4hjr1f zd%JZr(c_0*HDT2E$D<9yuKod9@$2_*5?|O00GOV-0RZ?*_0(MZ!d`3!1;>j}ukQ$uGs>tW_0D#`l ze+Tev7N%xq95ZRAZ-u5$o11wBR8}_u?5u);Z^}qdj@QJEG&_4E!^23to-ox10Ao?i z^l6|fz{F?<#o0VELzgiznh`Xy+ZRH*c)RD2kQus+;(u%&6Qdc7jg8qd#G3Okd|@w?l8kq5twJfu@P)mQw%3U9J^=XgiJ#ht8Pf-k;ETu+Q+*>= z`ZRd#7*k3z0v*AcYfsC;hWpg-KC_cvXX)xCEL{aY$YyKec9**u)Rh8&^QTYa`#*j$ z-HfFRJ%D{}#iGhZ&3cU}YqM?aT#^sAd7qR}YRs%9#H zS0+Lz6w<}tP9)IY*@>x{nP+j7SyD2wo4(zgFMqJyEQ%s3l?p1A3IO2exjA%3A}B5_ z)WkP7HthPbt#5=ypQ!*J4-Vqu&>&iaFQQcx@!R9a=s9{6Z}#=+@dpndvZQ1})9>wh z6~3*1bp3PZ-^aQ425jlu`e$fA@xLp8w7AR^e;!Pmpfo=ZX?~tM?le|9kAC>kb!`rZ z!++s$I2;a#!`WBZdX&_1b_4*>+MhsM{3ZM}@Rp;dXz9EC01L$@SektVp!q%o6Is>rlp-p(7b4?fF)N`t+D!U&|dThjUJ4;Mqlg2W$O3Ev;vHMdNb~v3ZVGa8!RcA zxpOLD8n<&c0ASw(Ec@?DNyeFb3S&BU&fHU=l;nnZ)sr@;vDF-H>**rf>J}7rOMj0A zI)Z!F9}IK^8;a1@(?u5M{$&1LJ-qwMYr?m8?^5S; zq%oqs`B*IGM7mvx#bS86s5YDvvI}zojE548#9}d&%Vk$*AK2*%TNT>M+io!bK_n8f sJcsA@SKxm^pTpsBI2;a#vtRfZFB1uEyqmA-OaK4?07*qoM6N<$f=Qu50{{R3 delta 1059 zcmV+;1l;?s3AhN5B!3BTNLh0L01FcU01FcV0GgZ_000B(NklHp$(W)3mqJEbc~Rs)czOT3cX!`+-~Imu-u*;eSbqUlfE8c`SOHdm6<`J8 zDR6J3-xg8D}Ks`C_pCD12nt&g=&>5y}5FoZhw47 z=f+F)bm9_iv<_+IXVq#<7yO07K}WX-^+6~6OvgwO6+`EX-rIthTfRjjFIQ=LdRhXa z`780fIMpKBPk+(SaM9cQzSVOPO#B>W+bs75Wupu{4(K=GInD_zC$~-mz6#G z(fAk-_+iDbx5ba;s+xcRY19uXR~V41-K-u^wlpY7>3@1b4t6iYAPQgW5a89=YR1No zwFk`XW@xgW7BPP;HaQXB@CX{9rJHAH?!&R3@QlAnZnQjF(dt()0J8&Z zOkTRa|9=9ZK!Q}i%CE+eh%<5R7>JJeP6A-X&CN)8fI%lwQ{tODzP|^!fLevXaB0+& z-~uTa0su$dZgtygOdHZcd=qQ*;<)F6@8khNpkewWjLn2x+jiiKh1vdEaT4A-Z~-1x zqUyuio}?}c2i}3}Bx7@5R)7^?1y})AfE8c`SbqUlfE8c`SOHdm6<`He0akz&`2Q7f z`jToUBRr{;X(*3#^ZpkkNz9F3(7-Oa3D#eQRgwe}C2%1(07RCTm;3fb7FfUpw&H=i zxiDIlE{65W>66;Pz}tnpMDORV#|sP-@A2A0Z?yhQ<|K^W+0=b(PK8w`D-SRyFV6$T zk$;pbyR)B_nfP5{$;k^2l8ZpK%?$uiD*^P(jESo=!l_4}s2>LtzyOvkAv`q4n1+=A zIH$k=Elsy-?QqAjv{@=kSIx&n>>!5X08ZcrjyA$D05p^#!L&7G4 zFieSD0F{{n0dQPy9+Zali>kBo05u3mz<&lX&gw9EGhaZpOX?0RU;)%YanTZJCpqBXKyY%|f2>0QbBKyJ7XmJt{B3*}&fJF;UuH0;?AGh(CG=EA4}}fVT(Wy%jEt@=g}|WcAuXiPLnt|oT+)`Fatmpo^x~0G zJnF!hDHhn4u@GX~!FxY`mQ~wNk`-8gA2721Sl{QT_xq#Ydw+mJp-?Ck3Weg+B*nQ{ zU&woI$HC5nXSjatiumpB-huc158pz|reRe-upk~se6=mgvQTL8e; zAN%6`a=}aM8X6T7fBpU^9+xkpkacm^(Xe`ai1{x*L+;W=IF^eKug_w40_hXY_m=o> zlyvc(tAAmfi+}Wmyb#y2Y23a25Uak(g;<>6*B=E}f20Gt4I7T- zqT8_1sF>pTo1>Gy?d$J8N26l)T^|R2eL3`Hn(wVp`hP>)3bi}Oa?!4}006m57lq)D z7v}KGKYxp-PY#+c&VYUwr9TMLpDxY-=!H5#(IH!Jml6BzT1$i^(DQf_^8ncfSsUQb1I8K#3Af|)h1H9zxjqBj zj>EYf8@hkDVWVAZ^=;+z9ELW5fs3>0o)iAt|K_)r2s^jqj118@pg&2r&^9bA2TbKM zKrSPCTUnf%f>jM|%UDnk??)afIItW5^oF15;(rXf4I5Lr47%t!hK8L2H!mY69{$Y2wmn$4$_SMsI&`axw|x)@M0Do&)$vY9bW3KFb00LXw#^`rftOjx+GG zGJgrqTVJ72C=?2XLZMJ7K3y`ihNmy&J$)hX?d~0TrfGU~JV_e>z%)&7cke*h6UGMC zD`aNY@Z@D_%GB0QPVu;W85`}|#9vD@vxc`ZUBv3~A&N_j0MM7849X)8gS8|Uv;b<9 zbQG5sQMhv-J9G1#+l69hZXSg@_fcG041X++;4Y1`96;;uj^(0JF~z=7(sA?F4VG{e zZr-|qKYspF*wm<)VqrEYZ#axltHLsJy8Ns&`Q`Dmjs~NoWBJLuz(fppWtzPzOrk-d zw$ZL}Z^tG`L(Uj+VL9N@y{9;R`4*=y-(qcLUF71ZP@%e6W*fkzx>@ckjA++dSbtkt z7j`|m_mp)%_9)5-QD8>^5ZwN0O+JYT zh|>mkxBan#gs6oI=Vb%?X;D8wZC@^9ODZ`b&q(FOY?uTIyAQDI%@lc=W`*5`ooHsp zt~XQE{>g^0*`ZLK;INS(Dg2sY>sON^j{?B?)CI()8Oi~2M>FZVpkc_`VLRZ^llLTR z0)`Q_Fgw!QOOyh|s0^zW;1JpY@}EAB+`L_HrjlHRQv6@}7dqqaduda&~CEmN+^xBt<s-@epWqU_ENzm=ulrM&m#{*pBk zbn?gdR;g>bHW9k1s0gJ3~B>Fg^J#ee?b&bmIH3Y4p^` zf%7$y(o$JfY>-e7KQv^yO4OYRn_Q9LZywEBv?rX0(|_f~^`$pIKd&VC`Pa3#RX^l( zvNScuRp^6L&>dIM4><{b>Sw`%F-7TUNb;F=fHtxEk`qq&31%v;yG#Vt#W8#;5B)QUh`D<3}Xpn|_4EmU(G z$7wQ2s_XbNJ(6*;ArLik$6&wL`P%wsc=??yUASEf4ak-smBW=19c!bFkZ5mjqim-? zZ+aN`6Mz-4y6TBTE_MaP84bWQvt?584ue`1N)>Gn#F8hfy#T%_o&)6~0=!(N?lHt0p?(ZSjknQ` z;%9@+7`jn6!50w_IuU?jMna>)&K6X3eE*bEe;XLW8tnmK8qVX)$J2y)LwnUQ#J-N7 zW`8d*A|Q?NTWzc(V5`kYtL+hOf`~gDgVE#WMel7p!#GjBI08+N!Kg0Rb__TM90QI4 z$ADwNG2j?*3^)cH1Fr-F(SPg`IXy8kp)O2^hllCl;X~Bh-D9LD5m<~6as+<;`4{5* z$+5Aq=G(zZ3V8PK8}c|=;o`2shNOuYyMI%60SnFp8#d@RNtKJf2LOnZBmh(@uF&zb zC)GE>*{NGJdh`Qty7*61XJNGGb??a3bsBhUulg8@?~#Q}?ZOr|!N#Py0gx9N%LE`v zL0v;@H??TvPEG<21Ed8u+}crDzXA`w5UVTkpf0%}6@3%@Zu>JDe?z;OkXmn19)I}= z^$NZkNs5SoIK`5rgg8A(`hd0j(>qB-8_HNC07%FeXm+uUA=(3QJ^op#Tlt7=u$cjW zxOPpQHX|end7L#8%KCBt-a}6%N8#OmqH4DEmrerP1KXtWCzU5`gkf4t5c@p)lGsbb z7Hm-0@|?Ws?*&)|()foB;t+_Y!L{0X7#&{AYoTD`yb%EygpwxiY8veQPEBKrcm>!q zduwP)M}T$?zchDJ+K`R_-|JQ!eJ>){2DUK)*mO8$u2s9gP6T7Z2H4_?W56+B#K3dX WbA6Gvgp{NWG?cis zh2m6j5JdU~931@$4t@$ZMI7Ah&@a%Tql*eo-HHls9Shb)krdh{7((zIVuFQMa^iT; zlDpj9`{(!Gy`WGi6bcEfMnxE|ExNsH@$-MTcP$Lp7FMGoR)3vcg(lG3G>-23oSn4MOkLJgVlU68 zG|9;4-P)mQ#@yTu=v-a$a~%m4q!jRmlWhDncwG2C9BwYG=OtH^R-+;cj=_99 z!)cZQm_GX)uYYfF`uUn=?+qsuYb8Fskh}`yzAT1o3xHy+gl=h>!!)4CkC~5W0EBPT z|G$LGjE*jLbM5;Lsm*CAQs(0s#abzw%SfLhbqV7j;=>EG`R#$T;5-f@8FRoN6o`W; zd-Kc2vI^wxga8G{fbZ7;NmEL*PD|mBWGw!n6Y7?R(>pAqnK}i>Kr?lmW;uHqvPj7V sNf{uKJbat38LlnTGRVrWP$(1tUn&%u*7LrEVE_OC07*qoM6N<$f}ma07XSbN delta 470 zcmV;{0V)361MmZoB!3BTNLh0L01m_e01m_fl`9S#0004^NklY5Pi8M zUW_1#ABCQX;BOEF8?m$y`~hlZW$VvStgJhT1NMRWSzfogyQFHEFnd3wP zbJvKl1IO&lzMYS^vj;eF3^)cH1CD|J#K3wri1^j(^(a|4ZGYKI`Za4$10seAro1Bf zjZXx4X};Q|)U;)fIBiVg3R>_{xdT7QBf5V_b^ib>YpXUX&mS6lrxGGJTtwLD0FTyVOBO5mUVmCu<;e6{)M#z|>F!e5 zYMQa1MhZz?fW&6U8z*nJbMa--nFC_L;wH)00000002;yooAK{oCLNHx($GrB>R zBGn)pcLladG{{CTfJB3A^a2o_-yn;(!@mg)G609RrJl3EBeIx*f$se3R|7Z4u)b#X! zbN`l^tMnM=s5mg;K=n-BLOX7(WXsE0ewlO8n|1fUNc`)Vz3pLjkgT~~)|`GLy(H%% z_Mcy8UhrC*mGIp+u0-JZHWjP9H>Zv-&9b~{J9om*}D@9Mv|-_~zC>-g(< z*xhr7^W%hNe=PRg^JPQgTnpJBKex?UpFBt2@6R@&Q@PL2Zup%zIY-nzZSk&DpZB-t z*s?tPwNrZcylH+h`;68XF)Os4<&AF(+rD9EnqGb%Zw z%yg~kyW{7TWc06WDM=CwXBXhv_hwS~@_N_Xr!Ca_XJ&Rrho!sSFkHdB;n%~Lrtf}z zdu#n#RXXeCnaI*V9?vaQ=1TF}^>W&;zq>r<oMC%^hU lF`WQ<->W-KMeib9q-Ow7|X=~1fH&bF6*2UngDAw7rg)g diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi/inhand-right.png index 32b49e37e429a6a7256e024ae080e76dfe8c979f..855940002282233d72d234a0669ad219b012c3b7 100644 GIT binary patch delta 468 zcmV;_0W1FO1nvWnB!2;OQb$4nuFf3k0004~Nkl1n490u^OMI>M#LkR&> z35KkW9>Af{wO8;A-5qsu%&s1wYZot2Pw*~K=-^N^RD$q2lmv}Qn$(DS<@+r`n_w#!vw88wnq^4cHKjf1O0(aQLI^qWdQu1> z&3;GPgRazFGj~f}!#TN+cEEHrhT-T~4LtzBa=AP@0)XM@n2yF5y`Zw9+>vDN)zB-R z+xPu=YMN!piGSCVnq|b(t?R8&Y3^vD?way_@epsXx^4ZWzvRw*2!`7|3`d9i{076( z5pMUFNnNqBxibgwwcY^$UZ3ucUe{gO+?fLaex~{OvR3BTkCe&X$U3nPLTrK%yN}Ns z0JXmN52>1)h=_=Yh=_=YsE$-^jq~LGD||@R*7!Gt2Tc%BwKYDAs;zMmg?50dt#PGP zZH+6XYHOUQ^g~e9);LS)0jSyfP delta 595 zcmaFI{Dx(MNEZzcbO{uT{2R4gdA{&G{|!{QczFJ1)du)2)iwKQ%9M zN#VV)-pkYK*nFm~7yNGdPN~JW*QRU!m=bk^6}Z2 z|L4U%?@R6VJtJ+)cyiybX{Kh333HyFon31x82ChDvGf5ZpU-LW-6rXqwi`BN7@mHU zZF2r%n<>NXH>(%#Q;xjG@WrS5P4B|Ueib0O~s#OcTBzK@=Jet*1r-xttmG#ZUYqtU#d zjBrjKw+g=NIe78%HD>PIkl!t@toz@7^92lH;-7;$>zZ7B0GRo57MDN$SiZl#`3K6& zO8~&uANb^AvE-Yh2KK5I)M_={yuE-6g-bZ9?_zCr9=2`c;^Z`(mW#J-NH-CiLb=QG*O1PfG*6*1sly^?c zMWe9~0MY^P4r-VzeU0kQFVdjBY6So=HZ}qJUYvRmrav||0iYe~1Vx8>&Y=1|Q-HkK zXzauDyb)C_Z`s)1TI>jY0Ps9-gbaxr1!4Mx({klQg{$8)1=MykbLU3a=YRkF8LmI= z&dnDuUw;E=r^%C_e(Y<+p!yWvXJH5vp69Xj+2eprHYZ;<8v8ONfwsrf7zd~}sM-L3 z957HDBwWww2&><|%6AyxdJgAuZ0Pz_5Y?mlIfuSoK*bPdhsfu@o>pC|z@F!^jo?7~ zWJ}N{E-VLRvN>e3IazI0@zYeOM>b{EG_)z9zCYzIO zXP8j5IW4y%70He$5y+|mDpU`Ko%dm=y1}}{C6WWoQA7UoGlYrYIDMFyqXshBT!%hI zU=&ymAWsKFon9w3{7sWsDWD$HCMkV(5eya}Al*Bkv_8uLy}X^~KmB|->a2;m2x zr+>wH>uWR`jYgx1vhUmV0&w^YYi`Hgb@DaPrk?6>O4wQ?S)!(eKKqvu@|fxV&D4xssWr{!X=T9L2wmW{dl zcUi)5n7e-$e=d}yO?%afoR|$;H|#~ESz#4*x%{ZU%My>mQGFMA%f|Jm-Am(V+1LyA ztT2g&h1&MkBKLA^!Zg$sqoG1ozu9d1a}OT+LI}TDEXhax)wQ8_g8Hj#9hyQ2e}C@5 zLupreWu0XMy9)&Gd~m-&8eJf`Cqc#aoZ)qWFiwsSr4j0Wfnh-!s%{+E5deheKh4Rf z5dlfsz+M?TYePcZjSA;w1N&}K9iZG-x3LZT?yEMaTj7Ayl_9PT>>A*C-UxY_MujKG zhpGK|vVroSY>4vXfrv%0S0_k|pjIY#2u#H80>Js~3rI>ck^|I2GxX6{4^-`_1(@9h zi2uuOkg)v%93ndaK&%alaY;%uvIA5D((C{MO}#Hb6O(@d|Fzp!`$zJj00000NkvXX Hu0mjfZWZpXgj(@`o0FJ{80FJ{80FJ{8 z0FJ{8zeU4g@t;27QO`arh$%K#eC<*4ANe zZVq7UUFYe!cz-5z-!m$L${&WV`0P$NQ~(-wGSSk~66EvwPHU&3*=&kuGC=;F2@zC& zvH^jkQRU_GM;ZaB{?5*hAk1d7qO4x8_gx$BXCZy_gD{BRH-#|%Fl=vcv-yV#Ktqqn z2{a1e%KcvN=WcC^@8~@fQz49B?sd8M%gf85c86i803FhlN=)ts8~ytB8F==w-76;{ zECI;Jk|Fpk`)1W$ng&fbc_T#Jcuymf1Fb1QWZ2*^pKKd)WAPei`o&rU$me2NQUcJZ zllf^>&|ZK8e;xpiXpz%hd|3j>E+|U5X@3mjiQ@{n0;Hmp*@6xJV>bm%!wUe8 z!wUe8!wUe8!wUe8!wUe8!waDEqt(?_aSDV1QVd*-rB5aHhe*cm-k$)29~7U&cmTH! zwg4EfTUb~S_jnXlsZ@j^V-Gh0DurZ(DAj`9x3ePhQ!15uM`1bSGI#&t2_%mP6Dl#eX!E-q@W8$no;iKW>ED5gZtu0#B-YU>nGh z$(%G+pD_V!M}`SX5>#xk1(2h$v;)%#O2&m83{majKqoK~$QvLsMvB&21=%3yDs;=W zY|z;W_JzcgYIm008*d<(I#5hY+Fc7nb@5U~nKtn5<=HX=c^(Bc$R1anKYaxFqugFozw z<$lf0+|JI-&de@291e%Wf_zv|LI_nqYO2rw>qku`gi!ggpnrba`x8l<;6Yd3`=tpg;%M}2Eun3?Y9;1Y*-!a>aJ>j!m+oN&3Mn7uPI9_ABwudKtTUP*# zn-~pG4=^b*v|49O&CYZ6Fu`Q9%kItwpV!BD+mtfiGVyIyf!mu)Enl?GN4}@4-pINs z#tHPEV=V_^k$?K(0sW{={qTSwEK=Q#zu1{zJS;*81(3^?@G~ATsL1q8SqJWP?f{Td z{{Iku=k$7i!N~46tc>$vL8a1Jt#>+imgzrJ*_xq@Ihgt6@L`qI_<$x1L1JeEBh zcfcPi5X+vv^WVv~6)=7Y0aEEKsdQEknW@}LHbE}!5&-Zs9)70G)8jqEc^E!I ywpS1=TL6PLz@X$(%7hR?4clN_euu;10C)$2=9}|o5=4Xm0000e;04Xt6I0!qm9#cK?{JFPN&mFn~|pJ(wN`(uygQ)s;X3c1E6!Y9srZ` z?I{9?3)nlISAQQJj#YAr)0Gwg?QD|Nayctx()YnL_Ak6&kpI$z&E*QBohyLNqep~c zxKuUcU?AgPz&;R&>;48VAIkZ@sr^;}BEI+8=-UZ_vXK>lG#l+NibCz#LKp+E*(fHL zkq|caTLFmWiwXHFY`&l|K-=Lp0mKObU~0BISn UfOck0bpQYW07*qoM6N<$f{D$*MF0Q* diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblack.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblack.rsi/meta.json index 138aaf3905..31713b5f02 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblack.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblack.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/8ef1b863b67ed708de551bba5d550b2c6f1d24e1, monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblue.rsi/equipped-INNERCLOTHING.png index 484aeba84b8ecf12451eec5f9159986f4d44b585..361ae56220a851d74ab061e2dd374e0bb3c80ee5 100644 GIT binary patch delta 1248 zcmV<61Rwjy3G@k&B!2;OQb$4nuFf3k000E8Nkl=xcc)~ym;^k>3i?c8b+~kdW6iUUm#yxh2A%C{>zVnJAvslntwO= zem1A^eX9OP(|;V4F065JC8lBbSp^%XNBrh@pH-m5Mn3r1G=3y zfE2o&Hm;iut z0ALKPF;_jjL~9u3Pk;T@XO`oFXa!FCiDYW5HRycINCc zpkZlNKY!k{7$D|}S-`G8N{Gjnt@uBMiM@b`64NXqUo}6561x>=O>mYleP)Z@CMqNc zB$6p4k}0qxBZ{+7Xn8heI__r|aXTo|_*U;5+{r5{k?YFD;Oi14LLpn04GcA?n)m5*1GlP~!@J^HX9P?Bn!VqQ(^@k|~Qm zYk^)MIe>ZEX(T58|9`?)2#DLT2}+-w1nmh3xP4&>gP`?E4si2!m;<4^(&wm|qN!$z zrhk1uEbdxgB9TZW5{X12kw`u~)J)M#7uL*lVa?pH*34e7$KT4rv;hEmy`H&Wt#Nz2 z*g#rEQ8PtToR(%q3V;3f6J9)cgt9p|wuTopYNlv@8~GO-r$<;=-UI;4`lQo3q8p?s zF{cU8Y)-?%@+Q*H%cv+r%H=#!QHDrAFMnfUdDF2tV$%Ad9g+js{JY*aa9*$R@7bJ& z?Y);IVLxo|y~H0||8Sem>oq$Gm@hNoF!5plV^H6%|ll4%X2ydJ@6A%;3LO`a8I zqE1b%Y|c?HN5)A*Trr|Ta=_m9W4t|hg0}}xP+FSjYjLbl;bKQ68$jh^N3|42Tz@x@ zQCgbkcI|CHCS8x*3)r8$ykMAi-~;!d=-wep)OKu-IpH0b#_yXagIOiVL&U_y@dngIDzk^D-M1 zc029RZl2k|;-A^z<>mp8Nzkn)2w4leCUpqR@ZAdlcT*P-l%^*Kh>2#_bwO^3+Flc| z=fQiJH34oo)eBJY_4eYYK+!KjX?k{mB@9CB0W6vs$hrWDPyPd)*~q<9>Z8Q~0000< KMNUMnLSTaWa$J}I delta 1203 zcmV;k1Wfz%3C9VLB!3BTNLh0L01m_e01m_fl`9S#000DeNklF|82=W! zWUe6QMpooWS%fIe4oaA8*(s1tTBt}Av=BsvkabK0v*=_bgt$xWp+kX(s0f2_52+ws z*42bWSZGZa(!5UZo1Jfbvux|UH-AcIexNh^cJ}?g_j`Z7H-GQ@_JGIX3jiL6F93KP zz5w8H_yT~(;R_)0@R61-1+TFO*PyMfEkNZ{Q&URM{W0}^bvh9MhrsinJk_L^&wiN! zS$@+3AbGg99@euNl{}qJE6~>mFg^}7hYvxhECE%a8unzD;)DpuA1Vu~_xZ+-8NR3Q zphb+|lmOItLVtWB29Zbv22;y$Py0;BKWDE9h5W!ep%8iT*;V~-o_|LHXxQ;YFJ8|> zI2?wi>I%qYGU{hCfd8ExA{6qI4G0{Kg}kEtrbYm&pZcDL+}a{EH(gN6QmK^T`tJ4; z1Una?vbs)x-Yyj5FNWmIq%eO;0chwEIRRCVzg>n)?0=qm|NLY8Wz`?{g%EG^>nUdU-yppc z#36V6<9@d2Y;5~rmr=?Kn1z%8*mzozapeWJ^13MkO}X^S99UgxgatrS1i2#;AqVaN zg(t51qm8;fvJeu0d@O>7A71sn0rLcG6$YnJseg?$ej`NOc#k7flwWEJ5LsH=cz_La zQHCE!L*h)o47&r0k*{qq3uICh-?>qTCLOO@{gApvmS zCApWPoyzS7?*e&PafLzxXp7E{Wlq5f{#`c(?1nD@cpSa};Boi@fXCqr03L@g0C*g} z0Dm$+8XX-~1C|&d#lS^yU%6{9L_9WrZz>r4p!g)l14Qc(769XQ4_|&(??YwtFfx!g zBy+AE>XS)Vgh)3xD>Wb9tC62OLkT@BCKHhs&Jf|_^mq!KH((56gM-j>u~UiVemE*Z zPvrq6!?@12UsVr7vGIo70dOEef(IRkV}Il6h#C(>F>9m0x&oL0;3P070lD->GkYjt zD|0F&d?JJ=u>Ui1f+th9c>%RY)@H#Cgl!DH+v)}}U*JZ^5;%!`PJ(^)2@CM)%@g%X zD=?3SM|;6(AV;{?SjMN#9X!!0RG+W_XF6^fKJy{!p<_wto(4yO9PwY<@kvC!BY)%) zF>IXz17Dlj{}pf&$Wb@~tiUz_3KOZEf-wooI)nwta?x1Yfn{w>i8Bj64X)505y%8a z^k^(agsJ!42$GNue69kbAYyD9!Xp3)nDz=%(~i)s#`89?i$YTY8;{{J85{i9VemM7 z0jyTwhU+WIZP6V{3!uj2wYa>S3oIaka);GCMGKG;;9oSj80@gaUjxA7_ybrfU_j28 R;Hm%s002ovPDHLkV1j0i8$$p9 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblue.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblue.rsi/icon.png index a13b6ba003e4c0aad67abb491043f7bc4cb70a73..012d2ee4c00604b3e7945df63a0a36d0745148d1 100644 GIT binary patch delta 439 zcmV;o0Z9Js1JMJJB!2;OQb$4nuFf3k0004tNkle(;;?PDPaff zHowcfo%i;=|2*CdXfzs)MuAMBDy*C<+MTY5?zcN#VdY$rDSuSOx_{TPty0|1I{=hR zCp7It(LUN2P5V%kOD6!>c?VSyu?2(}rbFYhMeXs9=`um>@s7r23&V6&Q^gk$J-wZG z==6u&_6B5jzPRlT==6s~{VH8h>cF$tmG;xXTUpy@4=etS3-ITGw8Jh;mkD|Li<{G5 zadFs+8))TR0e_ISi&(n`@Y9iFw;~I_jqiW#i5EL>{0{t)^rddaira_)Ku)?p5Af#! z2X$ZCQUAXQ2o@tg-e>ary7VdSkM|kDVx%k}p%QGE&PtK<@g9ablj021!N>bQ0m)RF zWGXF(Eh;E$7Xg?ml~)u1VC@=MZiVsdh-4}aARi&sD=-KO*Dxe}<$}csf8uRfIah?k hH+{NN&Zp66G~XFSnvgzielGw3002ovPDHLkV1h%8%_9H+ delta 467 zcmV;^0WAK}1MLHlB!3BTNLh0L01m_e01m_fl`9S#0004>NklY5Qg7? zm0u8IQk;rbImAYYX<~VPRQ`Yz8nF{gLEAKzf{j=ysD*`vMJl6L#zqe8!bJrodPP)H zB-)-gn`}(1b{9jMeVf_Y8+M+VoxMKvSQzdjC#P7+ ztYWwLgoCE9Dj@(~J&CG3y1a*FSx82Q;k~{wzfnEVh!gLE5C9!oe0JN~4A{2aVXw9x zFuOB=%6E;$mwyWok`MqTufCUnXdDszc3~}8^XixO5F~HJ6(KGm0BYx8JmK@hsX|Jc z*_=l1!svvA+)EH1!g|SJ5VWS3Kmf*e8L8w9^V{PfA?a5@bHE`Etq<%!daeB`Kv>ZtrqzI8`B}0o)gdSxidKEkUTXUkM=GthRmd%!x#+ zD_sR>PPiWn67o)P07@?V0;B;rgi~@l_Wt@^1^91i01eP{fFBaEu4kfXDKY>6002ov JPDHLkV1kaa&zk@M diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblue.rsi/meta.json index 138aaf3905..31713b5f02 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblue.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblue.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/8ef1b863b67ed708de551bba5d550b2c6f1d24e1, monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyergood.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyergood.rsi/equipped-INNERCLOTHING.png index 71a9d19cb1d589a6673aa2f051324c48cc595dd2..f4ed2dee7cf4a96eda722dfd410c9d1e5dc13497 100644 GIT binary patch delta 1251 zcmV<91RVRP3HJ$*B!2;OQb$4nuFf3k000EBNklYUZlTCm6@JHkg1J7Q*B;Av$4*-?3406*&@qMe_!181V0Lc33 zK`-1`U-R?X3|z-SnoZ&6&G-F@i5u{|F4AlYI0V=X!$xt<|917eksE>Q0{{bHA03Nx zY>@#d1lJMu-+vqAqDLz$LOgF6IISFDdh-=LuZ!u;S2(R4Aa5AK`D{i!sZk;8bJz?M ze==14D-E!*zUH$T2DjZ2!poB#oZBaun7Dy+`vl9A9WfBM9sIwszBUpgMD?$Ns(MR)2`O=`Bz^C$Mpu%y-!RA*Y0j@3s2y`80o?ik z;5v@@o_m4kbwf{IzHSs=5T~Cj7A|;$+wLG&EGX&sH2}AwU9F*PSt%~Y1r~4L3b{T2 zlr1Y|S8Ji)s}iTraoZj7CqvcmYkZ)MuAs&wsQ2L+tnU*(JPaq)<7_#GW6N zs6Kb^%YWeKDf;9*fV&zHJQ=nyFOFM{W+HijJO)`CpyvSty#_h1e$e&3w zDt&Sgj0PYe*(X10eUbtCSv$!@Xq5US1Mme&$uvW&EZ1=^ELO(Bb?a+18jVJy(P%Up z&3}Ie@(QYCnm*rr{5ks((rgO9e(`ClWSV|bD>ANiZ)e{>w@+}t9rOyQtO`lX;gV_k z^0qXNj)A>nU}xWd{ordPVT6)t`mcZg6ZdxZ{kgpgfWNoLd%MG=F_5;z;x<6p48z=B z1;vL?arpKf<#tLOzI}({!>5?rtHd@(P=B|^Nd^!l=ynIYTifE8%`oAHNpQb?9D3@z zTiaq|Hm+{i52amU8M$2Ud0mpY3ZB=!P?DFS?hlf8g}G>)t1aHXMZF!FI1RaCM1>Tv z?mpS{(`*U=a9TOQ$DKE!n&5)@8SbzT#~K9R*njv{>nCw+S8Mnsa|a(Re*yqFw|`GU zEqqr&8m#;ZMm%F|Sy zuRaD4AA`nT7vREiLc=yHT-O+sQ(;k)@AU;FG5_T;@QhS0%&Mfq1Bnj zMl;dMOxdzheE#z>s8)y6`UCpB30#sQs;SzaH1t~lxSqa%QE4g}Kn^tH?hEQW4oO=z z0F&PWoPSC;NL;@F1!V&O7^*>WSVpC(Yyf!x*HN1L`3p|OxU$o-|I`2g N002ovPDHLkV1nX&QxE_E delta 1171 zcmV;E1Z?~F38x8=B!3BTNLh0L01m_e01m_fl`9S#000D8Nklx`s)K<))kO*xp zm_tA)V(pJVjcG0(Y%dr7y<;U(l*1}6kejgnj^?^+g`2)ur3gwxV zEU5Au768dx&$PnEkDN}TXCA@F%=HCO`jSxKIhY0j*c8Gxdfu=@&&pW$R{G6U) zJsEyO0#N4(>3>JB;qZl4NF)+a&ji5l;kJYP8P>B}gi`);K=J7+!(USXayyY|xDDX$ z=Wh@Sgte|R~3L$h z$9>nkx->Kf8%Oe3ECz`;)4UETPW5WdSs94@ne{Ja-5$$T_^S#qlC6hRheEJ?q7xt< z-!UjZ3X#4(?vkWFVV2cjXTM8lKY|&I)rDXI+u7g3zQw^PrdWOCU#|OEvu;%ZwkD&# z`N?Qe8Gmgz*y&qCLy%gSFO-w}ZQdXBZQcjdP;IB2-IbvHCWtQgF!`1*IwXqIsJ06j zg^~c+d0LTilY60XQiGZAT=6xJ%dxz#c>CTW78ET96Vz+=7ghTa8LQX0}2p0dUbVQf3$I;NNpoz-o8` zfXm?t04|3o0Jt2U0N`?X0)Wfm383<$16Lya6bK{47#g3y-09dKA`$1NW;M(W*i7hW zk$)HukZnU+06kj!i{A&fSK+~mZphKG5tx{ma72ino*wP{&D%UNVu0C@Y0&Kfg^09t zhKLw*!&BgaCV|aO^xC zM)CvE#U#vyLcjz7JApX~?Mq209SF)^k$;8siO_C^!Hh!oWXiH#07qahodzdhW$4|~ zZ4mPXg25oz2{9+Z3P=kOYdOoW7<(Ut-$l=&!^2=VkfYQCD31Wxr%CdFR9b-Whj;o- zK);9~>WjU-n5PGJ0y#3Pp9A;8>jitFyqwhqJglrIV6%b;?Sf)K`56BZ}n3_Uw zgidu{w1L9%^ahCGF%=uUzr)~icmkMhz^Ux8O5A3*LuCPQ(V>mV$pw%=3nAqxszOPC l-RN*RSYd~^27t@)2RP|sVfB5xvF1LOmcB!2;OQb$4nuFf3k0004=Nklosi){u zhla)j-708!&>9&21?~wBE$Y$`)NXDrqR`~zB(+GxgQg~fdkVft1R-$9;Tp=)f>A?~Je002!<$chjaFoS3s`i(Xcl`1BaF%p$3`i(Y-rpcB90IZ56 zIag1@1e>p2u(x$gpB}Nkvy0>RE}U^KK#Cp1D2ddTa-dniwa3=8`Qtes7e!dW;ALo! zX^JB48DcUSBY*7~+N+<>6G3PTI)+i&a<3Huz`N~(cf$h`CYX*!IMk2q#+GTqGELmn z>n>3N!Vc70t%agz7neeLzu}fio}KiW&CPlq^k9D>E`!t|954pU?Ah;52Q0IP0b|kv zq#bZJxjxT-yTaI?9FP(aj7AWQMqu3CF9>pO#lHyv07DY+ft;SecrXx*Mn0Q=T|?O` z2mn$i7J&V)A25bmtL4h*I-gm8RW3`{Qz#UQ4<=rchgIT(1ONa407*qoM6N<$g4u)9 AegFUf delta 447 zcmV;w0YLub1K9(RB!3BTNLh0L01m_e01m_fl`9S#0004tNkl z{{_*jP^;0wIfI*>q?3ydqTtZQI0}W*e?o8(jH{psnn4{bBBTzALuMC$RMA%Htcyd; zJA5(da(7TfxG#jedpYtx?|bhcefVQp01IFNEPw^j0;qakOn+lAQNsP|Vvge@>pSu6 zbyLpQd_M;bDFaY)chW`sr3*1S0C9L04{dMad1*zy7w-k+2m4Wl7wbS69l_0Mgt2KC zVHjdO0iZPmjHCp>)sv{o8oJoHdxhgT=p;RlXbRwO3wRKr365BE|kkLf1E0$q(KlMJURXa z*^?&RZ8RhV&Bh37mF#B ziHrca*~tE*y#pCDh0q3wlB!9RoJWE%vEK-QEzdTdTR56Bx`NsOd=m(OonQb;u6qNt p0T?2Ae#T&`|Mfp$0W3f-^a&zWui=EO361~&002ovPDHLkV1kMp%W41s diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyergood.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyergood.rsi/meta.json index 98f1cf18e2..31713b5f02 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyergood.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyergood.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/305131e20cfe53eb41de61db79a99aa12c2925b0, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/8ef1b863b67ed708de551bba5d550b2c6f1d24e1, monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerpurple.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerpurple.rsi/equipped-INNERCLOTHING.png index d935927c5146bb7eca2810d6253377e27efba6a5..9c163e1793648c71263d6511c7d1194cd4a9715a 100644 GIT binary patch delta 1155 zcmV-}1bqAL2$%_wB!2;OQb$4nuFf3k000D1NklVHQEv{#&U}Reh>2{kkH~XP$0|x~l#+ej8@2 zERV*f008re>qxJzbKqp~^NH&KfM{$A87s@r?nNKcr;>TPA&Td`qP{N&WUMStB@+OE zFpD6SOknZOZGU8}EML5H8>wUhVHN=Zq>_oAJ3-bbYwWX5-*hxh49?fYbX>e zn4OtGp;*D()oa3#Qu(l_PH5LZ4^@3%5l|{0qEM`$RD3JWrIHC0iWSH+Q!2haY3I{e zzsUOU?SoU>ytfau^gB8rV`Vwbaz3{!&Qlc3&P;e_AAbPyxm^(*-A2J_`h%en)Q;<( zcD3U=216rS`W+oWo#k`8V$~<{Xlx1#H*bi+)A@&w?hnYa!3Tb0K3Mh&t7 zvd2HQK7WeugQDK3A&xRe}skkVR77OG<5pZ(jOZ74$bDV z_|(-`YW(xmFMKpKhS*RHcGLdq(`i-l;^2?K93blh5ZYAN(O0?!Nc_rh99M?p*sE+~ zZsI4EF1kY2C*-;gN)8~w4@YI;@x98nFv@P)U4I$l7g>K)iUJ*c{~2nB!p&(_wZ(Oj z!`*3ByK=m?11^&G8NZMS_`h)J9iX%bI<2Z$fMn=6==I>N{`;kGFc=I5gTY`h7z~%2 z^y)efDh;kf#>#R^*Q=uZ2A46$U%vVi)A31>w50sq(&DWkUx^FkoZ;-ugs^4d<_$C& zjep>5V2tsd*KfG%y4-bLJ{BA2W3h3bv9jEC-M&PHtVQ}{&(7;NoH5q>4HCr4@*1Y& zlK|k^FOa@>7tfyOdXf?D1kL=j=Q*VB-SzBA0D$TEBvzK!l={?qB~~gQ!rI&tDKc_G z(6_E_67haDRLDXlq29Q;la>I-y)!0yPt5mFc#&EF;RBjeGdFNVCUUuk0xVLk9{2T+!n($jmD?ZEd3$Tm<~o@|ga#ws=_8{6&#GUBg)@_`Rtw&BO`=RNwm8zhu} z2HR88B;K#VlMQy$#)qRa0R7z|fJu%T2N(xjv;h~5_Ja^@kfM6OAx&BU4F-c2{{no6 V&a$%erbPe%002ovPDHLkV1l0QM#}&I delta 1112 zcmV-e1gHC$3GE1wB!3BTNLh0L01m_e01m_fl`9S#000CZNklrhYOWnr0uefR$=KMUV+1RhpqCC_JnhL&i-HKs9x6|J^5UV6AtZDY!j>evcnCxY z6|8l&4U-T=6gI!N{nK-Hbmz^^%%OQ7$eZ`(&HMiUdvE@6`G5Z!3OKX?6mVz(DB#cn zP{5%DpnyXQpfWiUi4@V!&CO9f9uM(&Hk&Q>_4SGCLZJ{MkHGvuU0t0qet39jT&wci z7GUx7QgN{N37wpri2mBf*J4X!Gj0Fap+at_v{+4znD^jL%ykj4?$iE3qc1xxi=oPI zO8_j|-F4gOM}MNt#LlCYfq8C=VCDy8r>o(wD1ez9yBzO{QFeLB5CMIRJ2gUu-wssx zZNCC5t6xORuYmakU>qV~o~pri`NQEb9UUEs-8a7i=;OXB|AhiT#ir|#GUtJgw)Rpm zJl%Z;-^YABSM4b<^Y8EPQ$s_8z_d@ z;Mn5?$Z^3h;JA;rjndfa7)^Ff($waZ3CXP=MHkB%@i`^ z6-GKoD1UmT#2pGqZq)dLkRiW5Af^94zmbOPoU!<2(r@{ z5K49@i)@r1kVVg|WCTC@8243x{{>nA)d%FLYkz0lZMe;^EP&N}=127RieE_p1RXnL zUcn1~9Rn!f&;n4vp#`9TLkmCwhZcYW4lMu$99jU?2jsL<%hiZzn{Jd6rJe1!eEDU_ zwF$fVQeDFKuYXw})ntm20PMV+eMOR#Q{^zsYZ2tajCd?Y>zf;50{|pNJt>foAv+I3 zbAP>nmm-{T{%=i!oDN6JnPj_g6a!!Yl8^n5dyTB@!+ZDX{l^cUi6A=E2t$sKkBy=UFHQi~WD%It4Y>9dfI%;xzo3bU3D05xL>M0*FS_MC zpe%q<6&Ai+cF!tR?l!<-B>-2dsX|!*5Pxw^ARt#~3=a?E1dx{i2Nz~=r3m5xfRY`n zjkyR)0xUgSr0KQkvT-)VuM==yO#(IsDRdPmp8&2AutH|VyV?LoKA)##cha@>9MuO{ zWrC5Vg<)Qcz|PBQd4`khkdgq%2B+icqB$kbscJuxB%BeJYXfA*VWY}=j#6WCI#C>k zZ2jJ%`Sp2UGen7wg!s3-+5!#zYmfpCEdT`^js)Of!>ykIkO5Bq8dL*i0sO27s024` e(XRjn9De{nFFL=H9@B~d0000L`r#X%G@#6ia!(mi7dWS8bY=-Ay1H>RZ-T{?6qIN8A%5tU$QDC*rSm!a@F zq<0vLa1ZSEK5*Rc-uvC}_x=6e?+y$GgTbId##&TD2-R$~)PLReW}~Hq5GrFWs)ycv zh$nF!+iq7aSUCVz?KPT>mhz;pnvIrPwbuYxuyVBBu9k=y9cO@~NKviW6bo5Ceg1;; zW|x=wC6Xeg8w!ZofwtRK)rt*Fsw^+B(CZH<7P9pE1Io)Qgx#rDY^^TDJ_3N#{!wIC zD>l9UfKb@|{eMRnaC&wb*rq)*wPI_3aFFl_AwZnZWrA|n_A@rrk zIJo{t5WqON#+RN}a&4SaT?rwg>)Xlisb{BD*Zvb~onzPAS9=Oz_-n{0xFS89iSE`j z3xM~B@BZHm0L;(jnV-w^eeg9(TF$-(;OEVmZaBRTz~mSJM!^*a7atQ_xgC|B%>dvY gf6$I+Fc=Jf0AdWAlRZ1_sQ>@~07*qoM6N<$f^D4YLjV8( delta 429 zcmV;e0aE^i1jhrAB!3BTNLh0L01m_e01m_fl`9S#0004bNklLRhH%2WmH>i((nI2SFlX+BY&1%O0Fm zBA748n;GBCeCGR9l;Dpg00e*l5C8&z3qVy>g3T%0q~Yve%Hwb={45z@b_nBHOmXahy6!R0kLw56I+wQufhy zbYQ*im^XSDHD7||=Msk9A#F!#M5DLxz&a|vfV!g7IRBUfkGM-Xgs zttXoNHC6wML4QulP0w?2Egr?Qr!R1Fe8g}5+0z%$;%$S{F^fN`VIk@>^hA^YiBR?X zI$&*P*47hER2m8wKHuF#;dK#_$So9J7jeG3#|^186zGX2)@Ejh;sm#TKdAbB9Z)t^ zR2mA(riy&E^ZsG+z;XQMrxfy4=lR3HtuKbYi19J%OMkzo1DN*#pmfm*H5LV})+K-X zZ-1*g&KpJ)cJbqmJX=>!vF0@_u~5&8gNoSjY->XzgC ze(}<0R2mBZ6QSz&99WafOTdHs$N?}OJ-qSx)<%jyd6C@9_4fCR2f**|`x-H*eml{c zUC-CzQGXa`G<|X%z(NgZKbgg;jt|SG8cH1?+8}BJ^g3XmX^>I6Xgb2`*Y8>m1H?Qr z3fT3_riwz{ava6aDGWBZT%*OKZISCazpxX57Vn6&5F91!CYdeVCZCWTkWo!!rW6$F zP9p$Z4~6dIb66}+DQFi(P3Q^mW2K>hB|i!z2Y&$VN^24Ac{Zb(Ks<_!Y9bx81};|o z!jhnSo@Y71PXv;3fC$S6qaOEOh`R2)M8%f_(lLww^3&o`xa;&$l8#x(sHQ`oMW7!@ z4q%@4s>H<4|4#%O0^%`jhNVx=TAc*c3AwVV0*yd+j7^{90I>#e6IvlOMtzQ+%-VV~ zYk#|6hsC({B@&55B9TZW5{cyVLr-Sy-1NMio1V8fxA*N@t;T=?2LGZ2i5`P>`>7 z{?`*t7>}Qjgo9u_eu7_Clia3!wX-nmwQtx9U#r3*;&yqfbx9KUL#uVk`w_f0VyG+A zJ@6*Rg8K$GF}?Y7C$>vBnRlvSCM;XAotF|zd#tXfV(F_q;%07-7Mfm*;Kg^V!yzsU>c%s5Xggu z?a8|-)GZWtB7qI+$Im+v02c2{aN9~I23P&{N6e^9BY7n0NoD}kUws4AaJr-%irm5 z*iVGtkpMJ#!heg*1ax$C!2JBY`JI6MycWUA589u7P<-|Tu|=pU0J$AcwD#aJ6q89v zBoa_87Gc}?P6qJ*=Yk&DDya1Z_o2x(FSAQ0Q^(%O@73}!=Rp(b9+hzD2 zc>oSNQ`(4Jtc&Vs3=WRuvjYcV_TEp{hZJZ14B|Fu0763^R6ply)a(};p!V_0}ENa>#3n2k0#v;i5 z@JV8@NKkTTP%Zv=<&~RkAa4B3B7q>k)D|GJ+<)Q*GYVf#-R?yhe)NVG%I&#mVzF zi6&%)J%Fymaq@IUjTfR=wSn~lh5+CvkbeWY%t>qIg`nycQ3&4%;SKD+3_gwT1fE3! zT!FU`40e>uxP+%+5bFgRFN3cr*CecZHlDBmeV-TDGg>);dEC9V0Dc2GtRBFZ&E=xI zm(bWjSb(wPCwF}3Q`9Fqjl=f|_zK4H{x>%Q7a}h?o~K(NKdpn`K#sP!cjI{`fPb}+ z$}jLmP+mY-fC86|r8h8{q@-K$WpGw|L?E0P;j^)n5vJ7-B1u9v@U;pEK4UC0p0Ecn z0u6L5O`$i!peE1Tz|!)St$>rq^q7nd>gO<>V`Q`5+HK v0@V()Iz<(`)==~U!qw|> z8>?0uX19lE^crTjhgGYMu%D$1OdY7t5B7KO^XPl`ls@vGUBGN31h(G=$Jqwef4t29 z?4uzH@5%vTU#xQ0IdD>q)-uok0; mu4u#`zWVfwIUa|@;rs$b$eK544a1`V0000rX2o4SHg>LD~L31e|Xv^!J z3-_i?_g)g0`z`n0^DgK7&bjBj35;0=zyKHk17HA@0MfIIE`O~jl}E(maUZu=t5x@M zZG-JET6G^3Bn?2pSFIT|+Fi_B5qvpa_vkQ%>zge5ZcX~J5Dp*>xGE4@PjHvJ#eVVt z<#Jh^btMJBvnNrOjq?nei3Fn2D4O;=`reuBB)X?k1t|b>`ec8IGLwqM;?TN%wT#Tx zGwgnk-AAh~<9}KXfP&XP9U$mc00B`2M5aad_s6d+IJ;* zQ39|@@cwdE*e@!<0VufY1SkV=h Date: Fri, 11 Sep 2026 06:31:49 +0700 Subject: [PATCH 4/5] Contraband clearing (#3728) corvax --- .../ru-RU/contraband/contraband-severity.ftl | 2 +- .../Corvax/Entities/Clothing/Neck/pins.yml | 18 +++++++++--------- .../Entities/Objects/Devices/secapartment.yml | 2 +- .../Entities/Clothing/Back/backpacks.yml | 2 +- .../Entities/Clothing/Back/duffel.yml | 4 ++-- .../Entities/Clothing/Back/smuggler.yml | 2 +- .../Prototypes/Entities/Clothing/Head/hats.yml | 8 ++++---- .../Prototypes/Entities/Clothing/Head/misc.yml | 2 +- .../Entities/Clothing/Neck/scarfs.yml | 4 ++-- .../Clothing/OuterClothing/wintercoats.yml | 4 ++-- .../Entities/Clothing/Shoes/boots.yml | 2 +- .../Entities/Clothing/Shoes/magboots.yml | 2 +- .../Uniforms/Jumpsuits/ship_vs_ship.yml | 2 +- .../Clothing/Uniforms/Jumpsuits/special.yml | 10 +++++----- .../Entities/Objects/Devices/pda.yml | 2 +- .../Entities/Objects/Misc/briefcases.yml | 2 +- .../Entities/Objects/Misc/handy_flags.yml | 2 +- .../Objects/Specific/Medical/hypospray.yml | 2 +- .../Entities/Objects/Tools/jetpacks.yml | 2 +- .../Entities/Objects/Tools/toolbox.yml | 2 +- .../Structures/Storage/Closets/big_boxes.yml | 2 +- .../Structures/Wallmounts/Signs/flags.yml | 2 +- 22 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Resources/Locale/ru-RU/contraband/contraband-severity.ftl b/Resources/Locale/ru-RU/contraband/contraband-severity.ftl index 2c80a102a6..4fa96e38d3 100644 --- a/Resources/Locale/ru-RU/contraband/contraband-severity.ftl +++ b/Resources/Locale/ru-RU/contraband/contraband-severity.ftl @@ -46,7 +46,7 @@ contraband-examine-text-Magical = [reagent] [color={ $color }]Этот реагент является крайне незаконной магической контрабандой![/color] } -contraband-examine-text-avoid-carrying-around = [color=red][italic]Вам, вероятно, не стоит носить его с собой без веской причины.[/italic][/color] +contraband-examine-text-avoid-carrying-around = [color=orange][italic]Вам, вероятно, не стоит носить его с собой без причины.(см. КЗ контрабанды)[/italic][/color] contraband-examine-text-in-the-clear = [color=green][italic]Вам ничто не мешает носить это на виду.[/italic][/color] contraband-examinable-verb-text = Легальность diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml index 5f7755f08d..86d5eae0c9 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml @@ -10,7 +10,7 @@ - type: Clothing sprite: Corvax/Clothing/Neck/Misc/pins.rsi equippedPrefix: ath - + - type: entity parent: ClothingNeckPinBase id: ClothingNeckUSSPPin @@ -23,7 +23,7 @@ - type: Clothing sprite: Corvax/Clothing/Neck/Misc/pins.rsi equippedPrefix: comm - + - type: entity parent: ClothingNeckPinBase id: ClothingNeckCorvaxPin @@ -36,7 +36,7 @@ - type: Clothing sprite: Corvax/Clothing/Neck/Misc/pins.rsi equippedPrefix: cor - + - type: entity parent: ClothingNeckPinBase id: ClothingNeckDonkPin @@ -62,8 +62,8 @@ - type: Clothing sprite: Corvax/Clothing/Neck/Misc/pins.rsi equippedPrefix: earth - -- type: entity + +- type: entity parent: ClothingNeckPinBase id: ClothingNeckEchoPin name: comet pin @@ -101,7 +101,7 @@ - type: Clothing sprite: Corvax/Clothing/Neck/Misc/pins.rsi equippedPrefix: logistika - + - type: entity parent: ClothingNeckPinBase id: ClothingNeckMainPin @@ -114,7 +114,7 @@ - type: Clothing sprite: Corvax/Clothing/Neck/Misc/pins.rsi equippedPrefix: main - + - type: entity parent: ClothingNeckPinBase id: ClothingNeckDeForestPin @@ -166,7 +166,7 @@ - type: Clothing sprite: Corvax/Clothing/Neck/Misc/pins.rsi equippedPrefix: neb - + - type: entity parent: ClothingNeckPinBase id: ClothingNeckNovaPin @@ -181,7 +181,7 @@ equippedPrefix: nova - type: entity - parent: ClothingNeckPinBase + parent: [BaseCorvaxContraband131, ClothingNeckPinBase] id: ClothingNeckSyndicakePin name: Syndicake pin description: The pin of Syndicakes, on backside have a little numbers "2559". diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Devices/secapartment.yml b/Resources/Prototypes/Corvax/Entities/Objects/Devices/secapartment.yml index 1835d022f6..c50678676d 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Devices/secapartment.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Devices/secapartment.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseItem + parent: [ BaseCorvaxContraband433DepartmentsCommandSecurity, BaseItem ] id: SecApartmentTabletUnpowered name: SecApartment handheld tablet description: "A NanoTrasen-approved device for organizing and coordinating the actions of security personnel at corporate facilities." diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 0927dfd470..93442055b4 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -287,7 +287,7 @@ #Syndicate - type: entity - parent: [ClothingBackpack, BaseSyndicateContraband] + parent: [ClothingBackpack] # Corvax-Contraband BaseSyndicateContraband id: ClothingBackpackSyndicate name: syndicate backpack description: diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index 4c15bb4377..a644f8bab8 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -163,7 +163,7 @@ sprite: Clothing/Back/Duffels/salvage.rsi - type: entity - parent: [ClothingBackpackDuffel, BaseSyndicateContraband] + parent: [ClothingBackpackDuffel] # Corvax-Contraband BaseSyndicateContraband id: ClothingBackpackDuffelSyndicate name: syndicate duffel bag description: A large duffel bag for holding various traitor goods. @@ -177,7 +177,7 @@ - 0,0,8,4 - type: entity - parent: [ ClothingBackpackDuffelSyndicate, BaseSyndicateContraband ] + parent: [ ClothingBackpackDuffelSyndicate ] # Corvax-Contraband BaseSyndicateContraband id: ClothingBackpackDuffelSyndicateBundle abstract: true components: diff --git a/Resources/Prototypes/Entities/Clothing/Back/smuggler.yml b/Resources/Prototypes/Entities/Clothing/Back/smuggler.yml index 5df747a949..7ead6f09ca 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/smuggler.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/smuggler.yml @@ -40,7 +40,7 @@ state: icon - type: entity - parent: [ BaseSubfloorAnchorStorage, ClothingBackpackSatchel, BaseMinorContraband ] + parent: [ BaseSubfloorAnchorStorage, ClothingBackpackSatchel ] # Corvax-Contraband BaseMinorContraband id: ClothingBackpackSatchelSmugglerUnanchored name: smuggler's satchel suffix: Empty, Unanchored diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 3ad37fe77f..beb4181846 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -860,7 +860,7 @@ sprite: Clothing/Head/Hats/truckershat.rsi - type: entity - parent: [ ClothingHeadBase, BaseSyndicateContraband ] + parent: [ ClothingHeadBase] # Corvax-Contraband BaseSyndicateContraband id: ClothingHeadPyjamaSyndicateBlack name: syndicate black pyjama hat description: For keeping that traitor head of yours warm. @@ -876,7 +876,7 @@ HeadSide : HEAD - type: entity - parent: [ ClothingHeadBase, BaseSyndicateContraband ] + parent: [ ClothingHeadBase] # Corvax-Contraband BaseSyndicateContraband id: ClothingHeadPyjamaSyndicatePink name: syndicate pink pyjama hat description: For keeping that traitor head of yours warm. @@ -892,7 +892,7 @@ HeadSide : HEAD - type: entity - parent: [ ClothingHeadBase, BaseSyndicateContraband ] + parent: [ ClothingHeadBase] # Corvax-Contraband BaseSyndicateContraband id: ClothingHeadPyjamaSyndicateRed name: syndicate red pyjama hat description: For keeping that traitor head of yours warm. @@ -1096,7 +1096,7 @@ Caustic: 0.95 - type: entity - parent: [ClothingHeadBase, BaseSyndicateContraband] + parent: [ClothingHeadBase] # Corvax-Contraband BaseSyndicateContraband id: ClothingHeadHatSyndie name: syndicate hat description: A souvenir hat from "Syndieland", their production has already been closed. diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index 79f3df6a8d..31a848ff06 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -219,7 +219,7 @@ relayAccent: true - type: entity - parent: [ ClothingHeadBase, BaseSyndicateContraband ] + parent: [ ClothingHeadBase ] # Corvax-Contraband BaseSyndicateContraband id: ClothingHeadHatCatEars name: cat ears description: "NYAH!" diff --git a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml index fe037a888f..85bfa47dbe 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml @@ -87,7 +87,7 @@ sprite: Clothing/Neck/Scarfs/purple.rsi - type: entity - parent: [ ClothingScarfBase, BaseSyndicateContraband ] + parent: [ ClothingScarfBase ] # Corvax-Contraband BaseSyndicateContraband id: ClothingNeckScarfStripedSyndieGreen name: striped syndicate green scarf description: A stylish striped syndicate green scarf. The perfect winter accessory for those with a keen fashion sense, and those who are in the mood to steal something. @@ -100,7 +100,7 @@ price: 500 - type: entity - parent: [ ClothingScarfBase, BaseSyndicateContraband ] + parent: [ ClothingScarfBase ] # Corvax-Contraband BaseSyndicateContraband id: ClothingNeckScarfStripedSyndieRed name: striped syndicate red scarf description: A stylish striped syndicate red scarf. The perfect winter accessory for those with a keen fashion sense, and those who are in the mood to steal something. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 0a06ba3fa2..895fcb9cfa 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -756,7 +756,7 @@ clothingPrototype: ClothingHeadHatHoodWinterWarden - type: entity - parent: [ClothingOuterWinterCoatToggleable, BaseSyndicateContraband] + parent: [ClothingOuterWinterCoatToggleable] # Corvax-Contraband BaseSyndicateContraband id: ClothingOuterWinterSyndieCap name: syndicate's winter coat description: "The syndicate's winter coat is made of durable fabric, with gilded patterns, and coarse wool." @@ -795,7 +795,7 @@ ############################################################## - type: entity - parent: [ClothingOuterWinterCoatToggleable, BaseSyndicateContraband] + parent: [ClothingOuterWinterCoatToggleable] # Corvax-Contraband BaseSyndicateContraband id: ClothingOuterWinterSyndie name: syndicate's winter coat description: Insulated winter coat, looks like a merch from "Syndieland". diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml index 44027e7c9b..914166cf63 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml @@ -168,7 +168,7 @@ sprite: Clothing/Shoes/Boots/winterbootssec.rsi - type: entity - parent: [ClothingShoesBaseWinterBoots, BaseSyndicateContraband] + parent: [ClothingShoesBaseWinterBoots] # Corvax-Contraband BaseSyndicateContraband id: ClothingShoesBootsWinterSyndicate name: syndicate's winter boots description: Durable heavy boots, looks like merch from "Syndieland". diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml index 55d86208c6..450eb36d19 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml @@ -88,7 +88,7 @@ price: 3000 - type: entity - parent: [ClothingShoesBootsMagBase, BaseJetpack, BaseSyndicateContraband] + parent: [ClothingShoesBootsMagBase, BaseJetpack] # Corvax-Contraband BaseSyndicateContraband id: ClothingShoesBootsMagSyndie name: blood-red magboots description: Reverse-engineered from ERT magboots, they have a heavy magnetic pull and integrated thrusters. It can hold 0.75 L of gas. diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/ship_vs_ship.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/ship_vs_ship.yml index 406faaacbc..5b148e55f2 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/ship_vs_ship.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/ship_vs_ship.yml @@ -15,7 +15,7 @@ sprite: Clothing/Uniforms/Jumpsuits/ShipVsShip/recruit_nt.rsi - type: entity - parent: [ ClothingUniformBase, BaseSyndicateContraband ] + parent: [ ClothingUniformBase] # Corvax-Contraband BaseSyndicateContraband id: ClothingUniformJumpsuitRecruitSyndie name: syndicate recruit jumpsuit description: A dubious, dark-grey jumpsuit. As if passengers weren't dubious enough already. diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/special.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/special.yml index 370ad2fed6..a9e5ad9547 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/special.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/special.yml @@ -1,5 +1,5 @@ - type: entity - parent: [UnsensoredClothingUniformBase, BaseSyndicateContraband] + parent: [UnsensoredClothingUniformBase] # Corvax-Contraband BaseSyndicateContraband id: ClothingUniformJumpsuitPyjamaSyndicateBlack name: black syndicate pyjamas description: For those long nights in perma. @@ -10,7 +10,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Special/pyjamasyndicateblack.rsi - type: entity - parent: [UnsensoredClothingUniformBase, BaseSyndicateContraband] + parent: [UnsensoredClothingUniformBase] # Corvax-Contraband BaseSyndicateContraband id: ClothingUniformJumpsuitPyjamaSyndicatePink name: pink syndicate pyjamas description: For those long nights in perma. @@ -21,7 +21,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Special/pyjamasyndicatepink.rsi - type: entity - parent: [UnsensoredClothingUniformBase, BaseSyndicateContraband] + parent: [UnsensoredClothingUniformBase] # Corvax-Contraband BaseSyndicateContraband id: ClothingUniformJumpsuitPyjamaSyndicateRed name: red syndicate pyjamas description: For those long nights in perma. @@ -32,7 +32,7 @@ sprite: Clothing/Uniforms/Jumpsuits/Special/pyjamasyndicatered.rsi - type: entity - parent: [UnsensoredClothingUniformBase, BaseSyndicateContraband] + parent: [UnsensoredClothingUniformBase] # Corvax-Contraband BaseSyndicateContraband id: ClothingUniformJumpsuitOperative name: operative jumpsuit description: Uniform for elite syndicate operatives performing tactical operations in deep space. @@ -95,7 +95,7 @@ relayAccent: true - type: entity - parent: [ClothingUniformBase, BaseSyndicateContraband] + parent: [ClothingUniformBase] # Corvax-Contraband BaseSyndicateContraband 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/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 542900554f..6016b241ba 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -1165,7 +1165,7 @@ - DoorBumpOpener - type: entity - parent: [ BasePDA, BaseSyndicateContraband ] + parent: [ BasePDA ] # Corvax-Contraband 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! diff --git a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml index acb253219f..22a3427a18 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml @@ -34,7 +34,7 @@ size: Huge - type: entity - parent: [BriefcaseBase, BaseSyndicateContraband] + parent: [BriefcaseBase] # Corvax-Contraband BaseSyndicateContraband id: BriefcaseWeapon name: secure weapon case suffix: Gun, Empty diff --git a/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml b/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml index 6df1a39dc8..4f1edfde1c 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, BaseSyndicateContraband] + parent: [BaseCorvaxContraband131, BaseItem] # Corvax-Contraband BaseSyndicateContraband id: SyndieHandyFlag name: syndicate handheld flag description: "For truly rebellious patriots. Death to NT!" diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index e8504b1f02..00fa9b3aec 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -539,7 +539,7 @@ - type: entity abstract: true - parent: [SolutionToolSmall, ChemicalMedipen, BaseSyndicateContraband] + parent: [SolutionToolSmall, ChemicalMedipen] # Corvax-Contraband BaseSyndicateContraband id: SyndicateMedipen # Interdyne gets more capacity - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml index eca7f43725..f1e7d49328 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml @@ -116,7 +116,7 @@ #Empty black - type: entity id: JetpackBlack - parent: [BaseJetpack, BaseSyndicateContraband] + parent: [BaseJetpack] # Corvax-Contraband BaseSyndicateContraband name: jetpack suffix: Empty components: diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml index 194dcd8827..0303c7d685 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml @@ -116,7 +116,7 @@ - type: entity name: suspicious toolbox - parent: [ToolboxBase, BaseSyndicateContraband] + parent: [ToolboxBase] # Corvax-Contraband BaseSyndicateContraband id: ToolboxSyndicate description: A sinister looking toolbox filled with elite syndicate tools. components: diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/big_boxes.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/big_boxes.yml index 9607da0341..5c3287faf7 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/big_boxes.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/big_boxes.yml @@ -83,7 +83,7 @@ - type: entity id: StealthBox suffix: stealth - parent: [BaseCorvaxContraband435, BaseBigBox] # Corvax-Contraband + parent: BaseBigBox description: Kept ya waiting, huh? components: - type: Damageable diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml index e081ac23d7..82a4e146ae 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml @@ -27,7 +27,7 @@ state: NT_flag - type: entity - parent: BaseFlag + parent: [BaseCorvaxContraband131, BaseFlag] # Corvax-Contraband id: SyndieFlag name: syndicate flag description: Smells bloody. Death to NT! From 91cf10ac16807d3d168f96808c3baba5896d6a36 Mon Sep 17 00:00:00 2001 From: exo4ka <193421410+exo4ka@users.noreply.github.com> Date: Mon, 14 Sep 2026 16:17:42 +0300 Subject: [PATCH 5/5] Corvax maps tweaks (#3729) --- Resources/Maps/Corvax/corvax_cluster.yml | 77 ++++++----- Resources/Maps/Corvax/corvax_delta.yml | 57 ++++---- Resources/Maps/Corvax/corvax_omega.yml | 169 +++++++++++++---------- 3 files changed, 168 insertions(+), 135 deletions(-) diff --git a/Resources/Maps/Corvax/corvax_cluster.yml b/Resources/Maps/Corvax/corvax_cluster.yml index 742f7b9b94..dce0831b51 100644 --- a/Resources/Maps/Corvax/corvax_cluster.yml +++ b/Resources/Maps/Corvax/corvax_cluster.yml @@ -4,8 +4,8 @@ meta: engineVersion: 289.0.0 forkId: "" forkVersion: "" - time: 08/23/2026 09:11:21 - entityCount: 12753 + time: 09/14/2026 11:25:28 + entityCount: 12754 maps: - 12281 grids: @@ -13,7 +13,6 @@ grids: - 10949 orphans: [] nullspace: -- 12723 - 12724 - 12725 - 12726 @@ -44,6 +43,7 @@ nullspace: - 12751 - 12752 - 12753 +- 12754 tilemap: 0: Space 2: FloorArcadeBlue @@ -1445,7 +1445,6 @@ entities: - type: ExplosionAirtightGrid - type: ChunkContainer chunkEntities: - - 12723 - 12724 - 12725 - 12726 @@ -1476,6 +1475,7 @@ entities: - 12751 - 12752 - 12753 + - 12754 - type: TileHistory chunkHistory: {} - type: GridSplitNode @@ -23951,7 +23951,7 @@ entities: pos: -26.5,24.5 - proto: ChunkEntity entities: - - uid: 12723 + - uid: 12724 components: - type: ChunkEntity root: 1 @@ -24258,7 +24258,7 @@ entities: 2614: 27,21 2615: 27,20 2616: 27,19 - - uid: 12724 + - uid: 12725 components: - type: ChunkEntity root: 1 @@ -24662,7 +24662,7 @@ entities: 2688: 22.750717,9.677307 2689: 22.656967,9.521057 2690: 27.000717,5.786682 - - uid: 12725 + - uid: 12726 components: - type: ChunkEntity root: 1 @@ -24744,7 +24744,7 @@ entities: 1183: 20.983843,34.62477 1184: 19.968218,33.077896 1185: 23.34307,34.234146 - - uid: 12726 + - uid: 12727 components: - type: ChunkEntity root: 1 @@ -24857,7 +24857,7 @@ entities: color: '#F9801DFF' decals: 1114: 45,33 - - uid: 12727 + - uid: 12728 components: - type: ChunkEntity root: 1 @@ -25205,7 +25205,7 @@ entities: 227: 3,11 228: 3,9 229: 3,10 - - uid: 12728 + - uid: 12729 components: - type: ChunkEntity root: 1 @@ -25310,7 +25310,7 @@ entities: color: '#2BAF9D93' decals: 1234: 31,-19 - - uid: 12729 + - uid: 12730 components: - type: ChunkEntity root: 1 @@ -25524,7 +25524,7 @@ entities: 962: 14,-28 963: 12,-28 1028: 10,-28 - - uid: 12730 + - uid: 12731 components: - type: ChunkEntity root: 1 @@ -25804,7 +25804,7 @@ entities: 1942: -11,19 1943: -11.431358,19.09242 1944: -11.618858,19.233046 - - uid: 12731 + - uid: 12732 components: - type: ChunkEntity root: 1 @@ -26036,7 +26036,7 @@ entities: color: '#4B362BFF' decals: 2613: 15,22 - - uid: 12732 + - uid: 12733 components: - type: ChunkEntity root: 1 @@ -26320,7 +26320,7 @@ entities: 1398: -17,-16 1400: -18,-12 1401: -17,-12 - - uid: 12733 + - uid: 12734 components: - type: ChunkEntity root: 1 @@ -26537,7 +26537,7 @@ entities: decals: 74: -7,49 1089: -7,53 - - uid: 12734 + - uid: 12735 components: - type: ChunkEntity root: 1 @@ -26640,7 +26640,7 @@ entities: color: '#FFFFFFFF' decals: 128: -1,44 - - uid: 12735 + - uid: 12736 components: - type: ChunkEntity root: 1 @@ -26823,7 +26823,7 @@ entities: 1983: -17,21 1984: -17,20 1985: -17,19 - - uid: 12736 + - uid: 12737 components: - type: ChunkEntity root: 1 @@ -26995,7 +26995,7 @@ entities: 2351: 32,12 2352: 32,13 2353: 33,13 - - uid: 12737 + - uid: 12738 components: - type: ChunkEntity root: 1 @@ -27323,7 +27323,7 @@ entities: cleanable: True decals: 1978: -2.1235144,-2.16181 - - uid: 12738 + - uid: 12739 components: - type: ChunkEntity root: 1 @@ -27586,7 +27586,7 @@ entities: 1824: -27,8 1825: -27,6 1826: -26,5 - - uid: 12739 + - uid: 12740 components: - type: ChunkEntity root: 1 @@ -27788,7 +27788,7 @@ entities: color: '#D381C9FF' decals: 146: 1,51 - - uid: 12740 + - uid: 12741 components: - type: ChunkEntity root: 1 @@ -27839,7 +27839,7 @@ entities: decals: 1213: -12,-53 1214: -12,-54 - - uid: 12741 + - uid: 12742 components: - type: ChunkEntity root: 1 @@ -27893,7 +27893,7 @@ entities: decals: 1079: -44,-19 1080: -44,-20 - - uid: 12742 + - uid: 12743 components: - type: ChunkEntity root: 1 @@ -27948,7 +27948,7 @@ entities: 1471: -18,-28 1472: -18,-28 1473: -20,-25 - - uid: 12743 + - uid: 12744 components: - type: ChunkEntity root: 1 @@ -28049,7 +28049,7 @@ entities: color: '#FFFFFFFF' decals: 1062: -7,-27 - - uid: 12744 + - uid: 12745 components: - type: ChunkEntity root: 1 @@ -28262,7 +28262,7 @@ entities: decals: 850: 16,-4 1263: 17,-1 - - uid: 12745 + - uid: 12746 components: - type: ChunkEntity root: 1 @@ -28424,7 +28424,7 @@ entities: color: '#FFFFFFFF' decals: 1094: 44,30 - - uid: 12746 + - uid: 12747 components: - type: ChunkEntity root: 1 @@ -28732,7 +28732,7 @@ entities: decals: 237: -1,10 238: -1,11 - - uid: 12747 + - uid: 12748 components: - type: ChunkEntity root: 1 @@ -28975,7 +28975,7 @@ entities: decals: 1961: 1,-3 1973: 1,-6 - - uid: 12748 + - uid: 12749 components: - type: ChunkEntity root: 1 @@ -29051,7 +29051,7 @@ entities: color: '#EFB34196' decals: 1162: -2,-35 - - uid: 12749 + - uid: 12750 components: - type: ChunkEntity root: 1 @@ -29123,7 +29123,7 @@ entities: 1054: -40,21 1055: -40,22 1810: -40,23 - - uid: 12750 + - uid: 12751 components: - type: ChunkEntity root: 1 @@ -29150,7 +29150,7 @@ entities: 1411: -42,6 1412: -42,9 1413: -33,0 - - uid: 12751 + - uid: 12752 components: - type: ChunkEntity root: 1 @@ -29172,7 +29172,7 @@ entities: cleanable: True decals: 1476: 2,-34 - - uid: 12752 + - uid: 12753 components: - type: ChunkEntity root: 1 @@ -29213,7 +29213,7 @@ entities: color: '#2BAF9D93' decals: 1232: 33,-17 - - uid: 12753 + - uid: 12754 components: - type: ChunkEntity root: 1 @@ -69585,6 +69585,13 @@ entities: - type: Transform parent: 1 pos: 17.5,22.5 +- proto: SpawnPointWardenWeapon + entities: + - uid: 12723 + components: + - type: Transform + parent: 1 + pos: 17.5,23.5 - proto: SpawnVendingMachineRestockDrink entities: - uid: 3058 diff --git a/Resources/Maps/Corvax/corvax_delta.yml b/Resources/Maps/Corvax/corvax_delta.yml index bf2189e1b2..b0db6fb16d 100644 --- a/Resources/Maps/Corvax/corvax_delta.yml +++ b/Resources/Maps/Corvax/corvax_delta.yml @@ -4,7 +4,7 @@ meta: engineVersion: 289.0.0 forkId: "" forkVersion: "" - time: 08/23/2026 09:41:35 + time: 09/14/2026 11:02:03 entityCount: 41191 maps: - 1 @@ -13,15 +13,15 @@ grids: - 38569 orphans: [] nullspace: -- 25416 -- 25417 - 25418 - 25603 - 25604 - 25605 - 26761 - 27386 +- 27492 - 27494 +- 27764 - 29716 - 29718 - 29721 @@ -4484,15 +4484,15 @@ entities: - type: GridSplitNode - type: ChunkContainer chunkEntities: - - 25416 - - 25417 - 25418 - 25603 - 25604 - 25605 - 26761 - 27386 + - 27492 - 27494 + - 27764 - 29716 - 29718 - 29721 @@ -83746,7 +83746,7 @@ entities: pos: 63.66099,-25.833206 - proto: ChunkEntity entities: - - uid: 25416 + - uid: 25418 components: - type: ChunkEntity root: 2 @@ -84259,7 +84259,7 @@ entities: decals: 7095: 33,0 7125: 34,0 - - uid: 25417 + - uid: 25603 components: - type: ChunkEntity root: 2 @@ -84992,7 +84992,7 @@ entities: 20848: 5,24 20849: 7,24 20850: 8,24 - - uid: 25418 + - uid: 25604 components: - type: ChunkEntity root: 2 @@ -85151,7 +85151,7 @@ entities: color: '#FFFFFFFF' decals: 438: 0,-84 - - uid: 25603 + - uid: 25605 components: - type: ChunkEntity root: 2 @@ -85797,7 +85797,7 @@ entities: 11782: -16,-80 14444: -8,-78 14446: -3,-78 - - uid: 25604 + - uid: 26761 components: - type: ChunkEntity root: 2 @@ -86032,7 +86032,7 @@ entities: color: '#DABC8BFF' decals: 11783: -16,-81 - - uid: 25605 + - uid: 27386 components: - type: ChunkEntity root: 2 @@ -86723,7 +86723,7 @@ entities: 5692: -13,-4 5738: -10,-2 6084: -4,-12 - - uid: 26761 + - uid: 27492 components: - type: ChunkEntity root: 2 @@ -87354,7 +87354,7 @@ entities: 3977: -27,22 3981: -29,20 4014: -21,20 - - uid: 27386 + - uid: 27494 components: - type: ChunkEntity root: 2 @@ -87864,7 +87864,7 @@ entities: 5765: -16,9 5766: -16,10 5792: -3,13 - - uid: 27494 + - uid: 27764 components: - type: ChunkEntity root: 2 @@ -225603,14 +225603,6 @@ entities: pos: -50.5,37.5 - type: ApcPowerReceiver powerLoad: 0 - - uid: 27492 - components: - - type: Transform - parent: 2 - rot: -1.5707963267948966 rad - pos: -17.5,5.5 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 27493 components: - type: Transform @@ -228713,6 +228705,11 @@ entities: parent: 2 rot: 1.5707963267948966 rad pos: -63.5,-35.5 + - uid: 25417 + components: + - type: Transform + parent: 2 + pos: -15.5,5.5 - uid: 27734 components: - type: Transform @@ -228866,13 +228863,6 @@ entities: - type: Transform parent: 2 pos: -59.5,61.5 - - uid: 27764 - components: - - type: Transform - parent: 2 - pos: -15.5,5.5 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 27765 components: - type: Transform @@ -245118,6 +245108,15 @@ entities: - type: Transform parent: 2 pos: 17.5,-22.5 +- proto: SignPlaque + entities: + - uid: 25416 + components: + - type: MetaData + desc: Старая доска почета, жаль, что доска слишком изношена, чтобы можно было её прочитать, кроме нескольких слов "no_mad" "Aurora" "Bollo" "DanTheSynth", вот только что означают эти слова, вы никогда не узнаете. + - type: Transform + parent: 2 + pos: -16.5,5.5 - proto: SignPrison entities: - uid: 30362 diff --git a/Resources/Maps/Corvax/corvax_omega.yml b/Resources/Maps/Corvax/corvax_omega.yml index c7f3f56472..64ab967f79 100644 --- a/Resources/Maps/Corvax/corvax_omega.yml +++ b/Resources/Maps/Corvax/corvax_omega.yml @@ -4,15 +4,14 @@ meta: engineVersion: 289.0.0 forkId: "" forkVersion: "" - time: 08/23/2026 09:03:14 - entityCount: 14249 + time: 09/12/2026 14:09:59 + entityCount: 14250 maps: - 473 grids: - 4812 orphans: [] nullspace: -- 12570 - 12656 - 12975 - 13076 @@ -54,6 +53,7 @@ nullspace: - 14247 - 14248 - 14249 +- 14250 tilemap: 0: Space 41: FloorArcadeBlue @@ -354,6 +354,11 @@ entities: moles: Oxygen: 27.225372 Nitrogen: 102.419266 + - temperature: 293.14975 + volume: 2500 + moles: + Oxygen: 21.824879 + Nitrogen: 82.10312 - temperature: 293.15 volume: 2500 moles: {} @@ -665,7 +670,8 @@ entities: -8,8: 0: 3292 -7,4: - 0: 32631 + 0: 16247 + 3: 16384 -7,5: 0: 65287 -7,6: @@ -874,13 +880,13 @@ entities: 1: 3584 0,12: 0: 8448 - 3: 2176 + 4: 2176 0,13: 0: 66 0,14: 0: 2180 1,12: - 3: 4352 + 4: 4352 0: 34944 1,14: 0: 28928 @@ -899,7 +905,7 @@ entities: 3,13: 0: 13107 4,12: - 3: 32 + 4: 32 0: 32768 4,13: 0: 25612 @@ -910,12 +916,12 @@ entities: -9,8: 0: 136 -8,9: - 3: 16 + 4: 16 0: 8 -9,9: - 3: 142 + 4: 142 -8,10: - 3: 3 + 4: 3 0: 3072 -7,9: 0: 17535 @@ -1186,12 +1192,12 @@ entities: 0: 65529 8,-8: 0: 62003 - 3: 128 + 4: 128 8,-7: 0: 65535 8,-6: 0: 15 - 3: 26368 + 4: 26368 8,-9: 0: 48112 9,-5: @@ -1201,7 +1207,7 @@ entities: 9,-8: 0: 36072 9,-7: - 3: 64 + 4: 64 9,-6: 0: 19584 10,-8: @@ -1397,11 +1403,11 @@ entities: -9,10: 0: 17 -12,4: - 3: 546 - 4: 2184 + 4: 546 + 5: 2184 -13,4: - 3: 2184 - 5: 546 + 4: 2184 + 6: 546 -12,5: 0: 1 1: 3856 @@ -1410,7 +1416,7 @@ entities: -11,5: 1: 272 -11,4: - 6: 546 + 7: 546 -11,7: 0: 35904 -11,3: @@ -1423,7 +1429,7 @@ entities: -10,6: 0: 238 -10,7: - 3: 1632 + 4: 1632 -10,3: 0: 61007 -13,0: @@ -1462,7 +1468,7 @@ entities: 0: 12288 -16,0: 1: 4369 - 3: 3276 + 4: 3276 -17,0: 1: 8930 -16,1: @@ -1472,19 +1478,19 @@ entities: 1: 43746 -16,2: 1: 13090 - 3: 34944 + 4: 34944 -17,2: 1: 34986 -16,3: 1: 58594 -15,0: - 3: 273 + 4: 273 0: 52428 -15,1: 0: 239 1: 61440 -15,2: - 3: 13104 + 4: 13104 1: 34952 -15,3: 1: 16120 @@ -1501,20 +1507,20 @@ entities: 0: 61166 -14,4: 1: 12561 - 3: 2184 + 4: 2184 -16,-2: 0: 1772 -16,-3: 0: 51200 -15,-3: 0: 4368 - 3: 1024 + 4: 1024 -15,-2: 0: 2295 -15,-1: - 3: 1 + 4: 1 -15,-4: - 3: 16384 + 4: 16384 -14,-2: 0: 61424 -14,-1: @@ -1524,7 +1530,7 @@ entities: -14,-3: 0: 61166 -14,-5: - 3: 27848 + 4: 27848 -16,-8: 1: 61440 -17,-8: @@ -1675,7 +1681,6 @@ entities: - type: GridSplitNode - type: ChunkContainer chunkEntities: - - 12570 - 12656 - 12975 - 13076 @@ -1717,6 +1722,7 @@ entities: - 14247 - 14248 - 14249 + - 14250 - proto: AcousticGuitarInstrument entities: - uid: 1755 @@ -29273,7 +29279,7 @@ entities: pos: -2.493187,-34.40246 - proto: ChunkEntity entities: - - uid: 12570 + - uid: 12656 components: - type: ChunkEntity root: 4812 @@ -29649,7 +29655,7 @@ entities: angle: 1.5707963267948966 rad decals: 721: -39,-3 - - uid: 12656 + - uid: 12975 components: - type: ChunkEntity root: 4812 @@ -29863,7 +29869,7 @@ entities: angle: -1.5707963267948966 rad decals: 405: 27,-31 - - uid: 12975 + - uid: 13076 components: - type: ChunkEntity root: 4812 @@ -30056,7 +30062,7 @@ entities: 2422: -60,9 2427: -60,1 2432: -61,2 - - uid: 13076 + - uid: 13088 components: - type: ChunkEntity root: 4812 @@ -30126,7 +30132,7 @@ entities: color: '#FFFFFFFF' decals: 2141: 34,-5 - - uid: 13088 + - uid: 13201 components: - type: ChunkEntity root: 4812 @@ -30199,7 +30205,7 @@ entities: 1924: 53,-1 1927: 51,-1 1928: 52,-1 - - uid: 13201 + - uid: 13202 components: - type: ChunkEntity root: 4812 @@ -30576,7 +30582,7 @@ entities: color: '#A88661FF' decals: 3446: -7,-7 - - uid: 13202 + - uid: 13203 components: - type: ChunkEntity root: 4812 @@ -30827,7 +30833,7 @@ entities: 3435: -19,-9 3436: -19,-8 3437: -19,-7 - - uid: 13203 + - uid: 13549 components: - type: ChunkEntity root: 4812 @@ -31089,7 +31095,7 @@ entities: 963: 7,26 964: 8,26 965: 9,26 - - uid: 13549 + - uid: 13744 components: - type: ChunkEntity root: 4812 @@ -31335,7 +31341,7 @@ entities: 928: 24,1 930: 22,5 3088: 22,7 - - uid: 13744 + - uid: 13749 components: - type: ChunkEntity root: 4812 @@ -31442,7 +31448,7 @@ entities: color: '#FFFFFFFF' decals: 1901: 26,16 - - uid: 13749 + - uid: 14219 components: - type: ChunkEntity root: 4812 @@ -31614,7 +31620,7 @@ entities: 214: 15,46 215: 14,46 216: 13,46 - - uid: 14219 + - uid: 14220 components: - type: ChunkEntity root: 4812 @@ -31808,7 +31814,7 @@ entities: decals: 417: 3,-22 418: 3,-21 - - uid: 14220 + - uid: 14221 components: - type: ChunkEntity root: 4812 @@ -32014,7 +32020,7 @@ entities: color: '#EFB34196' decals: 619: -18,11 - - uid: 14221 + - uid: 14222 components: - type: ChunkEntity root: 4812 @@ -32182,7 +32188,7 @@ entities: decals: 2960: -37,15 3077: -37,14 - - uid: 14222 + - uid: 14223 components: - type: ChunkEntity root: 4812 @@ -32291,7 +32297,7 @@ entities: 871: -53,-12 872: -54,-12 873: -55,-12 - - uid: 14223 + - uid: 14224 components: - type: ChunkEntity root: 4812 @@ -32340,7 +32346,7 @@ entities: 997: 35,-28 998: 35,-27 999: 35,-26 - - uid: 14224 + - uid: 14225 components: - type: ChunkEntity root: 4812 @@ -32489,7 +32495,7 @@ entities: decals: 799: 13.296297,-42.144028 800: 3.8275461,-36.737778 - - uid: 14225 + - uid: 14226 components: - type: ChunkEntity root: 4812 @@ -32504,7 +32510,7 @@ entities: color: '#FFFFFFFF' decals: 1896: 32,14 - - uid: 14226 + - uid: 14227 components: - type: ChunkEntity root: 4812 @@ -32519,7 +32525,7 @@ entities: color: '#FFFFFFFF' decals: 1897: 32,16 - - uid: 14227 + - uid: 14228 components: - type: ChunkEntity root: 4812 @@ -32569,7 +32575,7 @@ entities: cleanable: True decals: 2518: -50,-18 - - uid: 14228 + - uid: 14229 components: - type: ChunkEntity root: 4812 @@ -32676,7 +32682,7 @@ entities: color: '#FFFFFFFF' decals: 2795: 7,14 - - uid: 14229 + - uid: 14230 components: - type: ChunkEntity root: 4812 @@ -32929,7 +32935,7 @@ entities: color: '#DE3A3A96' decals: 2919: -28,16 - - uid: 14230 + - uid: 14231 components: - type: ChunkEntity root: 4812 @@ -33107,7 +33113,7 @@ entities: color: '#FFFFFFFF' decals: 3076: -37,16 - - uid: 14231 + - uid: 14232 components: - type: ChunkEntity root: 4812 @@ -33142,7 +33148,7 @@ entities: 3107: -28,32 3108: -27,32 3109: -26,32 - - uid: 14232 + - uid: 14233 components: - type: ChunkEntity root: 4812 @@ -33270,7 +33276,7 @@ entities: decals: 980: -8,0 981: -8,1 - - uid: 14233 + - uid: 14234 components: - type: ChunkEntity root: 4812 @@ -33426,7 +33432,7 @@ entities: 2805: -13,28 2806: -12,28 2807: -11,28 - - uid: 14234 + - uid: 14235 components: - type: ChunkEntity root: 4812 @@ -33536,7 +33542,7 @@ entities: 2572: 9,50 2573: 10,50 2574: 11,50 - - uid: 14235 + - uid: 14236 components: - type: ChunkEntity root: 4812 @@ -33637,7 +33643,7 @@ entities: cleanable: True decals: 1035: -44,-27 - - uid: 14236 + - uid: 14237 components: - type: ChunkEntity root: 4812 @@ -33861,7 +33867,7 @@ entities: decals: 970: -29,-17 971: -28,-17 - - uid: 14237 + - uid: 14238 components: - type: ChunkEntity root: 4812 @@ -34017,7 +34023,7 @@ entities: angle: 1.5707963267948966 rad decals: 1608: -13,-40 - - uid: 14238 + - uid: 14239 components: - type: ChunkEntity root: 4812 @@ -34049,7 +34055,7 @@ entities: 1020: -25,-37 1021: -24,-37 1022: -23,-37 - - uid: 14239 + - uid: 14240 components: - type: ChunkEntity root: 4812 @@ -34447,7 +34453,7 @@ entities: decals: 1272: -7,-23 1273: -7,-22 - - uid: 14240 + - uid: 14241 components: - type: ChunkEntity root: 4812 @@ -34524,7 +34530,7 @@ entities: 1350: -11,-53 1351: -11,-52 1352: -11,-51 - - uid: 14241 + - uid: 14242 components: - type: ChunkEntity root: 4812 @@ -34635,7 +34641,7 @@ entities: color: '#FFFFFFFF' decals: 953: 0,-13 - - uid: 14242 + - uid: 14243 components: - type: ChunkEntity root: 4812 @@ -34721,7 +34727,7 @@ entities: 645: -38,-36 646: -38,-35 647: -38,-34 - - uid: 14243 + - uid: 14244 components: - type: ChunkEntity root: 4812 @@ -34790,7 +34796,7 @@ entities: 2730: 29,-8 2731: 30,-8 2732: 31,-8 - - uid: 14244 + - uid: 14245 components: - type: ChunkEntity root: 4812 @@ -34835,7 +34841,7 @@ entities: decals: 883: 17,32 886: 17,35 - - uid: 14245 + - uid: 14246 components: - type: ChunkEntity root: 4812 @@ -34870,7 +34876,7 @@ entities: color: '#FFFFFFFF' decals: 1880: 53,0 - - uid: 14246 + - uid: 14247 components: - type: ChunkEntity root: 4812 @@ -34933,7 +34939,7 @@ entities: 1125: -6,32 1126: -6,33 1127: -7,33 - - uid: 14247 + - uid: 14248 components: - type: ChunkEntity root: 4812 @@ -34948,7 +34954,7 @@ entities: color: '#FFFFFFFF' decals: 1907: 66,-23 - - uid: 14248 + - uid: 14249 components: - type: ChunkEntity root: 4812 @@ -34972,7 +34978,7 @@ entities: cleanable: True decals: 861: 27.509422,-40.416092 - - uid: 14249 + - uid: 14250 components: - type: ChunkEntity root: 4812 @@ -66507,6 +66513,17 @@ entities: - type: Transform parent: 4812 pos: -25.5,19.5 + - type: ContainerContainer + containers: + entity_storage: !type:Container + ents: + - 12570 + showEnts: False + occludes: True + paper_label: !type:ContainerSlot + ent: null + showEnts: False + occludes: True - proto: LockerWeldingSuppliesFilled entities: - uid: 11898 @@ -91278,6 +91295,16 @@ entities: - type: Transform parent: 4812 pos: -37.57921,10.753048 +- proto: WeaponEnergyShotgun + entities: + - uid: 12570 + components: + - type: Transform + parent: 7820 + - type: Physics + canCollide: False + - type: InsideEntityStorage + storage: 7820 - proto: WeaponEnergyTurretAI entities: - uid: 12270