From: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com> Date: Mon, 9 Sep 2024 19:36:25 +0000 (+0300) Subject: Fix some contraband issues (#31606) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=2263311ce2899ec7fd2845f81736b70f787017bc;p=space-station-14.git Fix some contraband issues (#31606) * Fix some contraband issues * Flaming fire axe to Syndie contraband * Add Central Command department and contraband group * Restricted encryption keys * ERT gas mask * Thieving beacon * Bladed flatcaps * Advanced circular saw and thief toolbox * Acolyte armor * Magazines and cartridges * SMG magazines * Grenades * Mercenary clothing and combat gloves * ERT, Deathsquad and Central Command Official items * Update * Who the fuck putted ERT into fun?! * Fix * Yeah * I forgot --- diff --git a/Resources/Locale/en-US/job/department-desc.ftl b/Resources/Locale/en-US/job/department-desc.ftl index 0243d61942..6357727432 100644 --- a/Resources/Locale/en-US/job/department-desc.ftl +++ b/Resources/Locale/en-US/job/department-desc.ftl @@ -1,6 +1,7 @@ department-Cargo-description = Complete bounties, earn Spessos, and order useful supplies for the crew. department-Civilian-description = Perform small helpful tasks to keep the station sane and well catered. department-Command-description = Manage the crew and keep them working efficiently. +department-CentralCommand-description = Manage the crew and keep them working efficiently. department-Engineering-description = Keep the power on and the station operational. department-Medical-description = Keep the crew healthy. department-Security-description = Keep the peace around the station. diff --git a/Resources/Locale/en-US/job/department.ftl b/Resources/Locale/en-US/job/department.ftl index 51a0345bc6..c77c1fd572 100644 --- a/Resources/Locale/en-US/job/department.ftl +++ b/Resources/Locale/en-US/job/department.ftl @@ -1,6 +1,7 @@ department-Cargo = Cargo department-Civilian = Civilian department-Command = Command +department-CentralCommand = Central Command department-Engineering = Engineering department-Medical = Medical department-Security = Security diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index 6f6a644eaf..0140adf8a2 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -21,6 +21,8 @@ job-name-hop = Head of Personnel job-name-captain = Captain job-name-serviceworker = Service Worker job-name-centcomoff = CentComm Official +job-name-cburn = Centcomm Quarantine Officer +job-name-deathsquad = Centcomm Agent job-name-reporter = Reporter job-name-musician = Musician job-name-librarian = Librarian diff --git a/Resources/Prototypes/Catalog/Fills/Items/misc.yml b/Resources/Prototypes/Catalog/Fills/Items/misc.yml index 4ec546caef..ac10a50510 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/misc.yml @@ -30,8 +30,8 @@ - ClothingShoesBootsSecFilled - type: entity - id: ClothingShoesBootsMercFilled parent: ClothingShoesBootsMerc + id: ClothingShoesBootsMercFilled suffix: Filled components: - type: ContainerFill diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index f94b773886..b589b2bbc0 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -192,7 +192,7 @@ #ERT - type: entity - parent: ClothingBackpack + parent: [ ClothingBackpack, BaseCentcommContraband ] id: ClothingBackpackERTLeader name: ERT leader backpack description: A spacious backpack with lots of pockets, worn by the Commander of an Emergency Response Team. diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index 76451f54f5..58e9bea0b4 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -245,7 +245,7 @@ - type: HeldSpeedModifier - type: entity - parent: ClothingBackpackDuffel + parent: [ ClothingBackpackDuffel, BaseCentcommContraband ] id: ClothingBackpackDuffelCBURN name: CBURN duffel bag description: A duffel bag containing a variety of biological containment equipment. diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 2201504b26..845944302f 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -621,7 +621,7 @@ sprite: Clothing/Belt/securitywebbing.rsi - type: entity - parent: ClothingBeltStorageBase + parent: [ ClothingBeltStorageBase, BaseSecurityCargoContraband ] id: ClothingBeltMercWebbing name: mercenary webbing description: Ideal for storing everything from ammo to weapons and combat essentials. diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml index d6cee89335..817f83ec92 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml @@ -76,7 +76,7 @@ - EncryptionKeyCommon - type: entity - parent: ClothingHeadset + parent: [ ClothingHeadset, BaseCentcommContraband ] id: ClothingHeadsetCentCom name: CentComm headset description: A headset used by the upper echelons of Nanotrasen. diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index d5d3b64e0f..2de84b45a2 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -255,7 +255,7 @@ - type: CriminalRecordsHacker - type: entity - parent: [ClothingHandsGlovesColorBlack, BaseSecurityEngineeringContraband] + parent: [ClothingHandsGlovesColorBlack, BaseSecurityCargoContraband] id: ClothingHandsGlovesCombat name: combat gloves description: These tactical gloves are fireproof and shock resistant. diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index 42075b1cf1..b97df840a7 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -540,7 +540,7 @@ #CENTCOMM / ERT HARDSUITS #ERT Leader Hardsuit - type: entity - parent: ClothingHeadHelmetHardsuitSyndieCommander + parent: [ BaseCentcommContraband, ClothingHeadHelmetHardsuitSyndieCommander ] id: ClothingHeadHelmetHardsuitERTLeader name: ERT leader hardsuit helmet description: A special hardsuit helmet worn by members of an emergency response team. @@ -561,7 +561,7 @@ #ERT Chaplain Hardsuit - type: entity - parent: ClothingHeadHelmetHardsuitSyndie + parent: [ BaseCentcommContraband, ClothingHeadHelmetHardsuitSyndie ] id: ClothingHeadHelmetHardsuitERTChaplain name: ERT chaplain hardsuit helmet description: A special hardsuit helmet worn by members of an emergency response team. @@ -575,7 +575,7 @@ #ERT Engineer Hardsuit - type: entity - parent: ClothingHeadHelmetHardsuitSyndie + parent: [ BaseCentcommContraband, ClothingHeadHelmetHardsuitSyndie ] id: ClothingHeadHelmetHardsuitERTEngineer name: ERT engineer hardsuit helmet description: A special hardsuit helmet worn by members of an emergency response team. @@ -596,7 +596,7 @@ #ERT Medical Hardsuit - type: entity - parent: ClothingHeadHelmetHardsuitSyndieElite + parent: [ BaseCentcommContraband, ClothingHeadHelmetHardsuitSyndieElite ] id: ClothingHeadHelmetHardsuitERTMedical name: ERT medic hardsuit helmet description: A special hardsuit helmet worn by members of an emergency response team. @@ -610,7 +610,7 @@ #ERT Security Hardsuit - type: entity - parent: ClothingHeadHelmetHardsuitSyndie + parent: [ BaseCentcommContraband, ClothingHeadHelmetHardsuitSyndie ] id: ClothingHeadHelmetHardsuitERTSecurity name: ERT security hardsuit helmet description: A special hardsuit helmet worn by members of an emergency response team. @@ -631,7 +631,7 @@ #ERT Janitor Hardsuit - type: entity - parent: ClothingHeadHelmetHardsuitSyndie + parent: [ BaseCentcommContraband, ClothingHeadHelmetHardsuitSyndie ] id: ClothingHeadHelmetHardsuitERTJanitor name: ERT janitor hardsuit helmet description: A special hardsuit helmet worn by members of an emergency response team. @@ -645,7 +645,7 @@ #CBURN Hardsuit - type: entity - parent: ClothingHeadHardsuitWithLightBase + parent: [ BaseCentcommContraband, ClothingHeadHardsuitWithLightBase ] id: ClothingHeadHelmetCBURN name: CBURN exosuit helmet description: A pressure resistant and fireproof hood worn by special cleanup units. @@ -684,7 +684,7 @@ #Deathsquad Hardsuit - type: entity - parent: ClothingHeadHardsuitBase + parent: [ BaseCentcommContraband, ClothingHeadHardsuitBase ] id: ClothingHeadHelmetHardsuitDeathsquad name: deathsquad hardsuit helmet description: A robust helmet for special operations. diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index c2e921bcbf..123896240d 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -182,7 +182,7 @@ sprite: Clothing/Head/Hats/beret_brigmedic.rsi - type: entity - parent: ClothingHeadBase + parent: [ ClothingHeadBase, BaseRestrictedContraband ] id: ClothingHeadHatBeretMerc name: mercenary beret description: Olive beret, the badge depicts a jackal on a rock. @@ -235,7 +235,7 @@ - type: IngestionBlocker - type: entity - parent: ClothingHeadBase + parent: [ ClothingHeadBase, BaseCentcommContraband ] id: ClothingHeadHatCentcom name: CentComm brand hat description: "It's good to be the emperor." @@ -890,7 +890,7 @@ - type: BlockMovement - type: entity - parent: ClothingHeadBase + parent: [ ClothingHeadBase, BaseCentcommContraband ] id: ClothingHeadHatCentcomcap name: CentComm cap description: An extravagant, fancy Central Commander cap. diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index 67f775c0e6..4ab01b4062 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -30,7 +30,7 @@ #Mercenary Helmet - type: entity - parent: ClothingHeadHelmetBasic + parent: [ ClothingHeadHelmetBasic, BaseRestrictedContraband ] id: ClothingHeadHelmetMerc name: mercenary helmet description: The combat helmet is commonly used by mercenaries, is strong, light and smells like gunpowder and the jungle. @@ -302,7 +302,7 @@ #ERT HELMETS #ERT Leader Helmet - type: entity - parent: ClothingHeadHelmetBasic + parent: [ BaseCentcommContraband, ClothingHeadHelmetBasic ] id: ClothingHeadHelmetERTLeader name: ERT leader helmet description: An in-atmosphere helmet worn by the leader of a Nanotrasen Emergency Response Team. Has blue highlights. @@ -314,7 +314,7 @@ #ERT Security Helmet - type: entity - parent: ClothingHeadHelmetBasic + parent: [ BaseCentcommContraband, ClothingHeadHelmetBasic ] id: ClothingHeadHelmetERTSecurity name: ERT security helmet description: An in-atmosphere helmet worn by security members of the Nanotrasen Emergency Response Team. Has red highlights. @@ -326,7 +326,7 @@ #ERT Medic Helmet - type: entity - parent: ClothingHeadHelmetBasic + parent: [ BaseCentcommContraband, ClothingHeadHelmetBasic ] id: ClothingHeadHelmetERTMedic name: ERT medic helmet description: An in-atmosphere helmet worn by medical members of the Nanotrasen Emergency Response Team. Has white highlights. @@ -338,7 +338,7 @@ #ERT Engineer Helmet - type: entity - parent: ClothingHeadHelmetBasic + parent: [ BaseCentcommContraband, ClothingHeadHelmetBasic ] id: ClothingHeadHelmetERTEngineer name: ERT engineer helmet description: An in-atmosphere helmet worn by engineering members of the Nanotrasen Emergency Response Team. Has orange highlights. @@ -350,7 +350,7 @@ #ERT Janitor Helmet - type: entity - parent: ClothingHeadHelmetBasic + parent: [ BaseCentcommContraband, ClothingHeadHelmetBasic ] id: ClothingHeadHelmetERTJanitor name: ERT janitor helmet description: An in-atmosphere helmet worn by janitorial members of the Nanotrasen Emergency Response Team. Has dark purple highlights. diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 1a213a7768..a8dcbf99ca 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -89,7 +89,7 @@ - type: IngestionBlocker - type: entity - parent: ClothingMaskGasAtmos + parent: [ ClothingMaskGasAtmos, BaseCentcommContraband ] id: ClothingMaskGasCentcom name: CentComm gas mask description: Oooh, gold and green. Fancy! This should help as you sit in your office. @@ -389,7 +389,7 @@ sprite: Clothing/Mask/merc.rsi - type: entity - parent: ClothingMaskGasSyndicate + parent: [ BaseCentcommContraband, ClothingMaskGasSyndicate ] id: ClothingMaskGasERT name: ert gas mask description: The gas mask of the elite squad of the ERT. diff --git a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml index e03ea02e68..abb3df78e7 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml @@ -109,7 +109,7 @@ sprite: Clothing/Neck/Scarfs/syndiered.rsi - type: entity - parent: ClothingScarfBase + parent: [ ClothingScarfBase, BaseCentcommContraband ] id: ClothingNeckScarfStripedCentcom name: striped CentComm scarf description: A stylish striped centcomm colored scarf. The perfect winter accessory for those with a keen fashion sense, and those who need to do paperwork in the cold. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 80588ba493..49dabaddaa 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -172,7 +172,7 @@ autoRechargeRate: 2 - type: entity - parent: ClothingOuterBaseLarge + parent: [ ClothingOuterBaseLarge, BaseMinorContraband ] id: ClothingOuterArmorCult name: acolyte armor description: An evil-looking piece of cult armor, made of bones. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index c6e3383931..0e84fca06d 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -763,7 +763,7 @@ #CENTCOMM / ERT HARDSUITS #ERT Leader Hardsuit - type: entity - parent: ClothingOuterHardsuitSyndieCommander + parent: [ BaseCentcommContraband, ClothingOuterHardsuitSyndieCommander ] id: ClothingOuterHardsuitERTLeader name: ERT leader's hardsuit description: A protective hardsuit worn by the leader of an emergency response team. @@ -777,7 +777,7 @@ #ERT Chaplain Hardsuit - type: entity - parent: ClothingOuterHardsuitJuggernaut + parent: [ BaseCentcommContraband, ClothingOuterHardsuitJuggernaut ] id: ClothingOuterHardsuitERTChaplain name: ERT chaplain's hardsuit description: A protective hardsuit worn by the chaplains of an Emergency Response Team. @@ -805,7 +805,7 @@ #ERT Medic Hardsuit - type: entity - parent: ClothingOuterHardsuitSyndieMedic + parent: [ BaseCentcommContraband, ClothingOuterHardsuitSyndieMedic ] id: ClothingOuterHardsuitERTMedical name: ERT medic's hardsuit description: A protective hardsuit worn by the medics of an emergency response team. @@ -819,7 +819,7 @@ #ERT Security Hardsuit - type: entity - parent: ClothingOuterHardsuitSyndie + parent: [ BaseCentcommContraband, ClothingOuterHardsuitSyndie ] id: ClothingOuterHardsuitERTSecurity name: ERT security's hardsuit description: A protective hardsuit worn by the security officers of an emergency response team. @@ -851,7 +851,7 @@ #Deathsquad - type: entity - parent: ClothingOuterHardsuitBase + parent: [ BaseCentcommContraband, ClothingOuterHardsuitBase ] id: ClothingOuterHardsuitDeathsquad name: death squad hardsuit description: An advanced hardsuit favored by commandos for use in special operations. @@ -888,7 +888,7 @@ #CBURN Hardsuit - type: entity - parent: ClothingOuterHardsuitBase + parent: [ BaseCentcommContraband, ClothingOuterHardsuitBase ] id: ClothingOuterHardsuitCBURN name: CBURN exosuit description: A lightweight yet strong exosuit used for special cleanup operations. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index ec38b79370..e7f5a59472 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -166,7 +166,7 @@ clothingPrototype: ClothingHeadHatHoodWinterCE - type: entity - parent: ClothingOuterWinterCoatToggleable + parent: [ ClothingOuterWinterCoatToggleable, BaseCentcommContraband ] id: ClothingOuterWinterCentcom name: CentComm winter coat components: @@ -1207,4 +1207,4 @@ color: "#EBE216" - state: winterbits-equipped-OUTERCLOTHING - type: ToggleableClothing - clothingPrototype: ClothingHeadHatHoodWinterColorYellow \ No newline at end of file + clothingPrototype: ClothingHeadHatHoodWinterColorYellow diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml index 32fd118f1c..fbaeba6047 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml @@ -73,7 +73,7 @@ sprite: Clothing/Shoes/Boots/highheelboots.rsi - type: entity - parent: ClothingShoesMilitaryBase + parent: [ ClothingShoesMilitaryBase, BaseRestrictedContraband ] id: ClothingShoesBootsMerc name: mercenary boots description: Boots that have gone through many conflicts and that have proven their combat reliability. diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index a3ffc5952a..42a0b7069d 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -124,7 +124,7 @@ sprite: Clothing/Uniforms/Jumpsuit/chaplain.rsi - type: entity - parent: ClothingUniformBase + parent: [ ClothingUniformBase, BaseCentcommContraband ] id: ClothingUniformJumpsuitCentcomAgent name: CentComm agent's jumpsuit description: A suit worn by CentComm's legal team. Smells of burnt coffee. @@ -135,7 +135,7 @@ sprite: Clothing/Uniforms/Jumpsuit/centcom_agent.rsi - type: entity - parent: ClothingUniformBase + parent: [ ClothingUniformBase, BaseCentcommContraband ] id: ClothingUniformJumpsuitCentcomOfficial name: CentComm official's jumpsuit description: It's a jumpsuit worn by CentComm's officials. @@ -146,7 +146,7 @@ sprite: Clothing/Uniforms/Jumpsuit/centcom_official.rsi - type: entity - parent: ClothingUniformBase + parent: [ ClothingUniformBase, BaseCentcommContraband ] id: ClothingUniformJumpsuitCentcomOfficer name: CentComm officer's jumpsuit description: It's a jumpsuit worn by CentComm Officers. @@ -860,7 +860,7 @@ mode: SensorOff - type: entity - parent: ClothingUniformBase + parent: [ ClothingUniformBase, BaseRestrictedContraband ] id: ClothingUniformJumpsuitMercenary name: mercenary jumpsuit description: Clothing for real mercenaries who have gone through fire, water and the jungle of planets flooded with dangerous monsters or targets for which a reward has been assigned. @@ -981,7 +981,7 @@ sprite: Clothing/Uniforms/Jumpsuit/musician.rsi - type: entity - parent: ClothingUniformBase + parent: [ BaseCentcommContraband, ClothingUniformBase ] id: ClothingUniformJumpsuitERTChaplain name: ERT chaplain uniform description: A special suit made for Central Command's elite chaplain corps. @@ -992,7 +992,7 @@ sprite: Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi - type: entity - parent: ClothingUniformBase + parent: [ BaseCentcommContraband, ClothingUniformBase ] id: ClothingUniformJumpsuitERTEngineer name: ERT engineering uniform description: A special suit made for the elite engineers under CentComm. @@ -1003,7 +1003,7 @@ sprite: Clothing/Uniforms/Jumpsuit/ert_engineer.rsi - type: entity - parent: ClothingUniformBase + parent: [ BaseCentcommContraband, ClothingUniformBase ] id: ClothingUniformJumpsuitERTJanitor name: ERT janitorial uniform description: A special suit made for the elite janitors under CentComm. @@ -1014,7 +1014,7 @@ sprite: Clothing/Uniforms/Jumpsuit/ert_janitor.rsi - type: entity - parent: ClothingUniformBase + parent: [ BaseCentcommContraband, ClothingUniformBase ] id: ClothingUniformJumpsuitERTLeader name: ERT leader uniform description: A special suit made for the best of the elites under CentComm. @@ -1025,7 +1025,7 @@ sprite: Clothing/Uniforms/Jumpsuit/ert_leader.rsi - type: entity - parent: ClothingUniformBase + parent: [ BaseCentcommContraband, ClothingUniformBase ] id: ClothingUniformJumpsuitERTMedic name: ERT medical uniform description: A special suit made for the elite medics under CentComm. @@ -1036,7 +1036,7 @@ sprite: Clothing/Uniforms/Jumpsuit/ert_medic.rsi - type: entity - parent: ClothingUniformBase + parent: [ BaseCentcommContraband, ClothingUniformBase ] id: ClothingUniformJumpsuitERTSecurity name: ERT security uniform description: A special suit made for the elite security under CentComm. diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index d7b059f3d8..7186f9f34a 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -27,7 +27,7 @@ - state: common_label - type: entity - parent: EncryptionKey + parent: [ EncryptionKey, BaseCargoContraband ] id: EncryptionKeyCargo name: cargo encryption key description: An encryption key used by supply employees. @@ -42,7 +42,7 @@ - state: cargo_label - type: entity - parent: EncryptionKey + parent: [ EncryptionKey, BaseCentcommContraband ] id: EncryptionKeyCentCom name: central command encryption key description: An encryption key used by captain's bosses. @@ -57,7 +57,7 @@ - state: nano_label - type: entity - parent: EncryptionKey + parent: [ EncryptionKey, BaseCentcommCommandContraband ] id: EncryptionKeyStationMaster name: station master encryption key description: An encryption key used by station's bosses. @@ -79,7 +79,7 @@ - state: cap_label - type: entity - parent: EncryptionKey + parent: [ EncryptionKey, BaseCommandContraband ] id: EncryptionKeyCommand name: command encryption key description: An encryption key used by crew's bosses. @@ -94,7 +94,7 @@ - state: com_label - type: entity - parent: EncryptionKey + parent: [ EncryptionKey, BaseEngineeringContraband ] id: EncryptionKeyEngineering name: engineering encryption key description: An encryption key used by the engineers. @@ -109,7 +109,7 @@ - state: eng_label - type: entity - parent: EncryptionKey + parent: [ EncryptionKey, BaseMedicalContraband ] id: EncryptionKeyMedical name: medical encryption key description: An encryption key used by those who save lives. @@ -124,7 +124,7 @@ - state: med_label - type: entity - parent: EncryptionKey + parent: [ EncryptionKey, BaseMedicalScienceContraband ] id: EncryptionKeyMedicalScience name: med-sci encryption key description: An encryption key used by someone who hasn't decided which side to take. @@ -140,7 +140,7 @@ - state: medsci_label - type: entity - parent: EncryptionKey + parent: [ EncryptionKey, BaseScienceContraband ] id: EncryptionKeyScience name: science encryption key description: An encryption key used by scientists. Maybe it is plasmaproof? @@ -155,7 +155,7 @@ - state: sci_label - type: entity - parent: EncryptionKey + parent: [ EncryptionKey, BaseScienceContraband ] id: EncryptionKeyRobo name: robotech encryption key description: An encryption key used by robototech engineers. Maybe it has a LAH-6000 on it? @@ -170,7 +170,7 @@ - state: robotics_label - type: entity - parent: EncryptionKey + parent: [ EncryptionKey, BaseSecurityContraband ] id: EncryptionKeySecurity name: security encryption key description: An encryption key used by security. @@ -185,7 +185,7 @@ - state: sec_label - type: entity - parent: EncryptionKey + parent: [ EncryptionKey, BaseCivilianContraband ] id: EncryptionKeyService name: service encryption key description: An encryption key used by the service staff, tasked with keeping the station full, happy and clean. @@ -200,7 +200,7 @@ - state: service_label - type: entity - parent: [EncryptionKey, BaseRestrictedContraband] + parent: [ EncryptionKey, BaseSyndicateContraband ] id: EncryptionKeySyndie name: blood-red encryption key description: An encryption key used by... wait... Who is the owner of this chip? @@ -215,7 +215,7 @@ - state: synd_label - type: entity - parent: [ EncryptionKey, BaseScienceContraband ] + parent: [ EncryptionKey, BaseSiliconScienceContraband ] id: EncryptionKeyBinary name: binary translator key description: An encryption key that translates binary signals used by silicons. diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 73085e18d9..2c5fb86cc0 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -454,17 +454,11 @@ - state: idcentcom - type: Item heldPrefix: blue - - type: IdCard - jobTitle: Central Commander - jobIcon: JobIconNanotrasen - - type: Access - groups: - - AllAccess - tags: - - CentralCommand + - type: PresetIdCard + job: CentralCommandOfficial - type: entity - parent: CentcomIDCard + parent: IDCardStandard id: ERTLeaderIDCard name: ERT leader ID card components: @@ -472,13 +466,13 @@ layers: - state: gold - state: ert_commander - - type: IdCard - jobTitle: ERT Company Commander + - type: PresetIdCard + job: ERTLeader - type: Item heldPrefix: gold - type: entity - parent: ERTLeaderIDCard + parent: IDCardStandard id: ERTChaplainIDCard name: ERT chaplain ID card components: @@ -486,13 +480,13 @@ layers: - state: gold - state: ert_chaplain # we have the sprite for the id but dont have chaplain ERT equipment for now. - - type: IdCard - jobTitle: ERT Soul Officer + - type: PresetIdCard + job: ERTChaplain - type: Item heldPrefix: blue - type: entity - parent: ERTChaplainIDCard + parent: IDCardStandard id: ERTEngineerIDCard name: ERT engineer ID card components: @@ -500,11 +494,11 @@ layers: - state: gold - state: ert_engineer - - type: IdCard - jobTitle: ERT Field Engineer + - type: PresetIdCard + job: ERTEngineer - type: entity - parent: ERTChaplainIDCard + parent: IDCardStandard id: ERTJanitorIDCard name: ERT janitor ID card components: @@ -512,11 +506,11 @@ layers: - state: gold - state: ert_janitor - - type: IdCard - jobTitle: ERT Custodian + - type: PresetIdCard + job: ERTJanitor - type: entity - parent: ERTChaplainIDCard + parent: IDCardStandard id: ERTMedicIDCard name: ERT medic ID card components: @@ -524,11 +518,11 @@ layers: - state: gold - state: ert_medic - - type: IdCard - jobTitle: ERT Medical Doctor + - type: PresetIdCard + job: ERTMedical - type: entity - parent: ERTChaplainIDCard + parent: IDCardStandard id: ERTSecurityIDCard name: ERT security ID card components: @@ -536,8 +530,8 @@ layers: - state: gold - state: ert_security - - type: IdCard - jobTitle: ERT Field Officer + - type: PresetIdCard + job: ERTSecurity - type: entity parent: IDCardStandard @@ -552,7 +546,7 @@ job: Musician - type: entity - parent: CentcomIDCard + parent: IDCardStandard id: CentcomIDCardDeathsquad name: death squad ID card components: @@ -561,8 +555,8 @@ - state: centcom - type: Item heldPrefix: blue - - type: IdCard - jobTitle: Centcomm Agent + - type: PresetIdCard + job: DeathSquad - type: entity name: passenger ID card @@ -718,8 +712,8 @@ - state: centcom - type: Item heldPrefix: blue - - type: IdCard - jobTitle: Centcomm Quarantine Officer + - type: PresetIdCard + job: CBURN - type: entity parent: IDCardStandard diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml index 8b1606dc5d..9b6da25eb7 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml @@ -223,7 +223,7 @@ - type: entity name: advanced circular saw id: SawAdvanced - parent: SawElectric + parent: [ SawElectric, BaseSyndicateContraband ] description: You think you can cut anything with it. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Tools/thief_beacon.yml b/Resources/Prototypes/Entities/Objects/Tools/thief_beacon.yml index c35e66127d..042b3fe517 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/thief_beacon.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/thief_beacon.yml @@ -1,4 +1,5 @@ - type: entity + parent: BaseMinorContraband 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. @@ -35,4 +36,4 @@ noRot: true layers: - state: extraction_point - map: [ "foldedLayer" ] \ No newline at end of file + map: [ "foldedLayer" ] diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml index b2ad5dec6b..dd1f41e571 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml @@ -148,7 +148,7 @@ id: ToolboxThief name: thief undetermined toolbox description: This is where your favorite thief's supplies lie. Try to remember which ones. - parent: BaseItem + parent: [ BaseItem, BaseMinorContraband ] components: - type: Sprite sprite: Objects/Tools/Toolboxes/toolbox_thief.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml index 0d8775f37a..e622952b3f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseCartridge + parent: [ BaseCartridge, BaseMajorContraband ] id: CartridgeAntiMateriel name: cartridge (.60 anti-materiel) components: 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 9e46725b94..21edce2222 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,7 +1,7 @@ - type: entity id: BaseCartridgeCaselessRifle name: cartridge (.25 rifle) - parent: BaseCartridge + parent: [ BaseCartridge, BaseRestrictedContraband ] abstract: true components: - type: Tag 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 a63351b6f9..719bae8ab4 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,7 +1,7 @@ - type: entity id: BaseCartridgeHeavyRifle name: cartridge (.20 rifle) - parent: BaseCartridge + parent: [ BaseCartridge, BaseRestrictedContraband ] abstract: true components: - type: Tag 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 80623f874e..4cf3c759bb 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,7 +1,7 @@ - type: entity id: BaseCartridgeLightRifle name: cartridge (.30 rifle) - parent: BaseCartridge + parent: [ BaseCartridge, BaseRestrictedContraband ] abstract: true components: - type: Tag 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 b6cb65db05..3367fa45a1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml @@ -1,7 +1,7 @@ - type: entity id: BaseCartridgeMagnum name: cartridge (.45 magnum) - parent: BaseCartridge + parent: [ BaseCartridge, BaseRestrictedContraband ] abstract: true components: - type: Tag 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 c097d7746e..3635b00f36 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml @@ -1,7 +1,7 @@ - type: entity id: BaseCartridgePistol name: cartridge (.35 auto) - parent: BaseCartridge + parent: [ BaseCartridge, BaseRestrictedContraband ] abstract: true components: - type: Tag 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 21e6daa2b8..30976744e0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml @@ -1,7 +1,7 @@ - type: entity id: BaseCartridgeRifle name: cartridge (.20 rifle) - parent: BaseCartridge + parent: [ BaseCartridge, BaseRestrictedContraband ] abstract: true components: - type: Tag 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 1d90fab7c2..47577b0857 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml @@ -1,7 +1,7 @@ - type: entity id: BaseShellShotgun name: shell (.50) - parent: BaseCartridge + parent: [ BaseCartridge, BaseRestrictedContraband ] abstract: true components: - type: Tag @@ -123,7 +123,7 @@ maxTransferAmount: 7 - type: SpentAmmoVisuals state: "tranquilizer" - + - type: entity id: ShellShotgunImprovised name: improvised shotgun shell 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 2c23d803e2..5aa1f285c8 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,7 +1,7 @@ - type: entity id: BaseMagazineCaselessRifle name: "magazine (.25 caseless)" - parent: BaseItem + parent: [ BaseItem, BaseRestrictedContraband ] abstract: true components: - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/grenade.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/grenade.yml index 0b23ebc966..389a4033cb 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/grenade.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/grenade.yml @@ -1,7 +1,7 @@ - type: entity id: BaseMagazineGrenade name: grenade cartridge - parent: BaseItem + parent: [ BaseItem, BaseRestrictedContraband ] abstract: true components: - type: Tag @@ -45,7 +45,7 @@ parent: BaseMagazineGrenade components: - type: BallisticAmmoProvider - + - type: entity id: MagazineGrenadeFrag name: frag grenade cartridge @@ -84,4 +84,4 @@ parent: BaseMagazineGrenade components: - type: BallisticAmmoProvider - proto: GrenadeBaton \ No newline at end of file + proto: GrenadeBaton diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml index d8af7064a4..ba5094255c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml @@ -1,7 +1,7 @@ - type: entity id: BaseMagazineHeavyRifle name: "magazine (.20 rifle)" - parent: BaseItem + parent: [ BaseItem, BaseRestrictedContraband ] abstract: true components: - type: Tag 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 495bcd37d1..5784564378 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 @@ -2,7 +2,7 @@ - type: entity id: BaseMagazineLightRifle name: "magazine (.30 rifle)" - parent: BaseItem + parent: [ BaseItem, BaseRestrictedContraband ] abstract: true components: - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml index 304014d11b..4f6f101be4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml @@ -1,7 +1,7 @@ - type: entity id: BaseMagazineMagnum name: pistol magazine (.45 magnum) - parent: BaseMagazinePistol + parent: [ BaseMagazinePistol, BaseRestrictedContraband ] abstract: true components: - type: Tag 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 850be4b130..bd85e2691b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -1,7 +1,7 @@ - type: entity id: BaseMagazinePistol name: pistol magazine (.35 auto) - parent: BaseItem + parent: [ BaseItem, BaseRestrictedContraband ] abstract: true components: - type: Tag @@ -67,7 +67,7 @@ - type: entity id: BaseMagazinePistolSubMachineGun # Yeah it's weird but it's pistol caliber name: SMG magazine (.35 auto) - parent: BaseItem + parent: [ BaseItem, BaseRestrictedContraband ] abstract: true components: - type: Tag @@ -100,7 +100,7 @@ - type: entity id: MagazinePistolSubMachineGunTopMounted name: WT550 magazine (.35 auto top-mounted) - parent: BaseItem + parent: [ BaseItem, BaseRestrictedContraband ] components: - type: Tag tags: @@ -282,7 +282,7 @@ parent: BaseMagazinePistolSubMachineGun components: - type: BallisticAmmoProvider - proto: null + proto: null - type: Sprite layers: - state: base 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 b2148ba1b2..c882a3b2f1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml @@ -2,7 +2,7 @@ - type: entity id: BaseMagazineRifle name: "magazine (.20 rifle)" - parent: BaseItem + parent: [ BaseItem, BaseRestrictedContraband ] abstract: true components: - type: Tag 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 5b0b16bf4b..cc679b12d8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml @@ -1,7 +1,7 @@ - type: entity id: BaseMagazineShotgun name: ammo drum (.50 shells) - parent: BaseItem + parent: [ BaseItem, BaseRestrictedContraband ] abstract: true components: - type: Tag 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 08d50db9b2..ae6bf0cebf 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml @@ -1,7 +1,7 @@ - type: entity id: BaseSpeedLoaderMagnum name: "speed loader (.45 magnum)" - parent: BaseItem + parent: [ BaseItem, BaseRestrictedContraband ] abstract: true components: - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml index 3ce419b2c3..8f3ec37753 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml @@ -1,7 +1,7 @@ - type: entity id: BaseSpeedLoaderPistol name: "speed loader (.35 auto)" - parent: BaseItem + parent: [ BaseItem, BaseRestrictedContraband ] abstract: true components: - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml index f527440600..71b1119267 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml @@ -1,7 +1,7 @@ - type: entity id: SpeedLoaderLightRifle name: "speed loader (.30 rifle)" - parent: BaseItem + parent: [ BaseItem, BaseRestrictedContraband ] components: - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml index 2af85fae4f..de75ae4be4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml @@ -53,7 +53,7 @@ - type: entity id: FireAxeFlaming name: fire axe - parent: FireAxe + parent: [BaseSyndicateContraband, FireAxe] description: Why fight fire with an axe when you can fight with fire and axe? Now featuring rugged rubberized handle! components: - type: MeleeWeapon diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml index 506a36d08a..ae5b22f8e0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml @@ -136,7 +136,7 @@ sprite: Objects/Weapons/Melee/kukri_knife.rsi - type: entity - parent: [ClothingHeadHatGreyFlatcap, BaseSyndicateContraband] + parent: ClothingHeadHatGreyFlatcap id: BladedFlatcapGrey name: grey flatcap description: Fashionable for both the working class and old man Jenkins. It has glass shards hidden in the brim. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml index fca6fea4f8..a279c56378 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml @@ -373,7 +373,7 @@ path: /Audio/Effects/hallelujah.ogg - type: entity - parent: [ GrenadeBase, BaseMinorContraband ] + parent: [ GrenadeBase, BaseRestrictedContraband ] id: SmokeGrenade name: smoke grenade description: A tactical grenade that releases a large, long-lasting cloud of smoke when used. @@ -391,7 +391,7 @@ path: /Audio/Items/smoke_grenade_prime.ogg - type: entity - parent: SmokeGrenade + parent: [ BaseCivilianContraband, SmokeGrenade ] id: CleanerGrenade name: cleanade description: Special grenade for janitors, releasing large cloud of space cleaner foam. @@ -424,7 +424,7 @@ Quantity: 50 - type: entity - parent: SmokeGrenade + parent: [ BaseEngineeringContraband, SmokeGrenade ] id: MetalFoamGrenade name: metal foam grenade description: An emergency tool used for patching up holes. Almost as good as real walls. diff --git a/Resources/Prototypes/Entities/Objects/base_contraband.yml b/Resources/Prototypes/Entities/Objects/base_contraband.yml index fffa4b506c..6f44767c9f 100644 --- a/Resources/Prototypes/Entities/Objects/base_contraband.yml +++ b/Resources/Prototypes/Entities/Objects/base_contraband.yml @@ -35,7 +35,15 @@ - type: Contraband severity: Restricted -# departmentally restricted contraband -- this covers every configuration currently listed in space law +# one department restricted contraband +- type: entity + id: BaseCentcommContraband + parent: BaseRestrictedContraband + abstract: true + components: + - type: Contraband + allowedDepartments: [ CentralCommand ] + - type: entity id: BaseCommandContraband parent: BaseRestrictedContraband @@ -45,44 +53,93 @@ allowedDepartments: [ Command ] - type: entity - id: BaseSecurityCommandContraband + id: BaseSecurityContraband parent: BaseRestrictedContraband abstract: true components: - type: Contraband - allowedDepartments: [ Security, Command ] + allowedDepartments: [ Security ] - type: entity - id: BaseSecurityScienceCommandContraband + id: BaseEngineeringContraband parent: BaseRestrictedContraband abstract: true components: - type: Contraband - allowedDepartments: [ Security, Science, Command ] + allowedDepartments: [ Engineering ] - type: entity - id: BaseSecurityEngineeringContraband + id: BaseScienceContraband parent: BaseRestrictedContraband abstract: true components: - type: Contraband - allowedDepartments: [ Security, Engineering ] + allowedDepartments: [ Science ] - type: entity - id: BaseEngineeringContraband + id: BaseMedicalContraband parent: BaseRestrictedContraband abstract: true components: - type: Contraband - allowedDepartments: [ Engineering ] + allowedDepartments: [ Medical ] - type: entity - id: BaseScienceContraband + id: BaseCivilianContraband parent: BaseRestrictedContraband abstract: true components: - type: Contraband - allowedDepartments: [ Science ] + allowedDepartments: [ Civilian ] + +- type: entity + id: BaseCargoContraband + parent: BaseRestrictedContraband + abstract: true + components: + - type: Contraband + allowedDepartments: [ Cargo ] + +# multiple departments restricted contraband +- type: entity + id: BaseCentcommCommandContraband + parent: BaseRestrictedContraband + abstract: true + components: + - type: Contraband + allowedDepartments: [ CentralCommand, Command ] + +- type: entity + id: BaseSecurityCommandContraband + parent: BaseRestrictedContraband + abstract: true + components: + - type: Contraband + allowedDepartments: [ Security, Command ] + +- type: entity + id: BaseSecurityScienceCommandContraband + parent: BaseRestrictedContraband + abstract: true + components: + - type: Contraband + allowedDepartments: [ Security, Science, Command ] + +- type: entity + id: BaseSecurityEngineeringContraband + parent: BaseRestrictedContraband + abstract: true + components: + - type: Contraband + allowedDepartments: [ Security, Engineering ] + +- type: entity + id: BaseSiliconScienceContraband + parent: BaseRestrictedContraband + abstract: true + components: + - type: Contraband + allowedDepartments: [ Science, Silicon ] - type: entity id: BaseSecurityCargoContraband @@ -93,12 +150,12 @@ allowedDepartments: [ Security, Cargo ] - type: entity - id: BaseCargoContraband + id: BaseMedicalScienceContraband parent: BaseRestrictedContraband abstract: true components: - type: Contraband - allowedDepartments: [ Cargo ] + allowedDepartments: [ Medical, Science ] # for ~objective items - type: entity diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml b/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml new file mode 100644 index 0000000000..3f8d07092c --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml @@ -0,0 +1,37 @@ +- type: job + id: CBURN + name: job-name-cburn + description: job-description-cburn + playTimeTracker: JobCBURN + setPreference: false + startingGear: CBURNGear + icon: "JobIconNanotrasen" + supervisors: job-supervisors-centcom + canBeAntag: false + accessGroups: + - AllAccess + access: + - CentralCommand + +- type: startingGear + id: CBURNGear + equipment: + jumpsuit: ClothingUniformJumpsuitColorBrown + back: ClothingBackpackDuffelCBURN + mask: ClothingMaskGasERT + eyes: ClothingEyesGlassesSecurity + ears: ClothingHeadsetAltCentCom + gloves: ClothingHandsGlovesCombat + outerClothing: ClothingOuterHardsuitCBURN + shoes: ClothingShoesBootsCombatFilled + id: CBURNPDA + pocket1: RadioHandheld + pocket2: WeaponLaserGun + belt: ClothingBeltBandolier + storage: + back: + - WeaponShotgunDoubleBarreled + - BoxShotgunIncendiary + - GrenadeFlashBang + - PillAmbuzolPlus + - PillAmbuzol diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml b/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml new file mode 100644 index 0000000000..5f731fa582 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml @@ -0,0 +1,44 @@ +- type: job + id: DeathSquad + name: job-name-deathsquad + description: job-description-deathsquad + playTimeTracker: JobDeathSquad + setPreference: false + startingGear: DeathSquadGear + icon: "JobIconNanotrasen" + supervisors: job-supervisors-centcom + canBeAntag: false + accessGroups: + - AllAccess + access: + - CentralCommand + +- type: startingGear + id: DeathSquadGear + equipment: + jumpsuit: ClothingUniformJumpsuitDeathSquad + back: ClothingBackpackDeathSquad + mask: ClothingMaskGasDeathSquad + eyes: ClothingEyesHudSecurity + ears: ClothingHeadsetAltCentCom + gloves: ClothingHandsGlovesCombat + outerClothing: ClothingOuterHardsuitDeathsquad + shoes: ClothingShoesBootsMagAdv + id: DeathsquadPDA + pocket1: EnergySword + pocket2: EnergyShield + belt: ClothingBeltMilitaryWebbingMedFilled + storage: + back: + - WeaponPulsePistol + - WeaponRevolverMateba + - SpeedLoaderMagnumAP + - SpeedLoaderMagnumAP + - BoxFlashbang + - ToolDebug # spanish army knife + - WelderExperimental + - Hypospray + - DeathAcidifierImplanter # crew will try to steal their amazing hardsuits + - FreedomImplanter + inhand: + - WeaponPulseRifle diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml rename to Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml diff --git a/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml b/Resources/Prototypes/Roles/Jobs/CentComm/official.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml rename to Resources/Prototypes/Roles/Jobs/CentComm/official.yml diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index 79560d22f5..04da99826a 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -17,37 +17,6 @@ back: - BoxSurvival -#Deathsquad Outfit -- type: startingGear - id: DeathSquadGear - equipment: - jumpsuit: ClothingUniformJumpsuitDeathSquad - back: ClothingBackpackDeathSquad - mask: ClothingMaskGasDeathSquad - eyes: ClothingEyesHudSecurity - ears: ClothingHeadsetAltCentCom - gloves: ClothingHandsGlovesCombat - outerClothing: ClothingOuterHardsuitDeathsquad - shoes: ClothingShoesBootsMagAdv - id: DeathsquadPDA - pocket1: EnergySword - pocket2: EnergyShield - belt: ClothingBeltMilitaryWebbingMedFilled - storage: - back: - - WeaponPulsePistol - - WeaponRevolverMateba - - SpeedLoaderMagnumAP - - SpeedLoaderMagnumAP - - BoxFlashbang - - ToolDebug # spanish army knife - - WelderExperimental - - Hypospray - - DeathAcidifierImplanter # crew will try to steal their amazing hardsuits - - FreedomImplanter - inhand: - - WeaponPulseRifle - # Syndicate Operative Outfit - Civilian - type: startingGear id: SyndicateOperativeGearCivilian @@ -101,30 +70,6 @@ - Flash - MagazinePistol -#CBURN Unit Gear - Full Kit -- type: startingGear - id: CBURNGear - equipment: - jumpsuit: ClothingUniformJumpsuitColorBrown - back: ClothingBackpackDuffelCBURN - mask: ClothingMaskGasERT - eyes: ClothingEyesGlassesSecurity - ears: ClothingHeadsetAltCentCom - gloves: ClothingHandsGlovesCombat - outerClothing: ClothingOuterHardsuitCBURN - shoes: ClothingShoesBootsCombatFilled - id: CBURNPDA - pocket1: RadioHandheld - pocket2: WeaponLaserGun - belt: ClothingBeltBandolier - storage: - back: - - WeaponShotgunDoubleBarreled - - BoxShotgunIncendiary - - GrenadeFlashBang - - PillAmbuzolPlus - - PillAmbuzol - - type: startingGear id: BoxingKangarooGear equipment: diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 6178ff89a2..15737a273b 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -33,6 +33,24 @@ - Zookeeper - ServiceWorker +- type: department + id: CentralCommand + name: department-CentralCommand + description: department-CentralCommand-description + color: "#0c344d" + roles: + - CentralCommandOfficial + - CBURN + - ERTLeader + - ERTChaplain + - ERTJanitor + - ERTMedical + - ERTSecurity + - ERTEngineer + - DeathSquad + editorHidden: true + weight: 120 + - type: department id: Command name: department-Command @@ -40,13 +58,21 @@ color: "#334E6D" roles: - Captain - - CentralCommandOfficial - ChiefEngineer - ChiefMedicalOfficer - HeadOfPersonnel - HeadOfSecurity - ResearchDirector - Quartermaster + - CentralCommandOfficial + - CBURN + - ERTLeader + - ERTChaplain + - ERTJanitor + - ERTMedical + - ERTSecurity + - ERTEngineer + - DeathSquad primary: false weight: 100 diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml index d4cd1ec15d..26647e79ae 100644 --- a/Resources/Prototypes/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Roles/play_time_trackers.yml @@ -64,6 +64,12 @@ - type: playTimeTracker id: JobERTSecurity +- type: playTimeTracker + id: JobDeathSquad + +- type: playTimeTracker + id: JobCBURN + - type: playTimeTracker id: JobHeadOfPersonnel