From 916e291f491c7aa6b4dbfc57c08a3777f263b506 Mon Sep 17 00:00:00 2001 From: Username228 Date: Fri, 24 May 2024 02:44:38 +0300 Subject: [PATCH] fixes --- .../Catalog/Fills/Lockers/heads.yml | 221 ++++++++++++++---- .../Objects/Specific/Research/anomaly.yml | 20 +- .../Sirena/Objectives/stealTargetGroups.yml | 6 + .../Sirena/Objectives/traitorObjectives.yml | 22 +- .../Objects/Devices/pinpointer.rsi/meta.json | 3 + ...ter_anomaly.png => pinpointer-anomaly.png} | Bin 6 files changed, 197 insertions(+), 75 deletions(-) create mode 100644 Resources/Prototypes/Sirena/Objectives/stealTargetGroups.yml rename Resources/Textures/Objects/Devices/pinpointer.rsi/{pinpointer_anomaly.png => pinpointer-anomaly.png} (100%) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 56a7773c92d..ed91fb23bba 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -5,9 +5,11 @@ components: - type: StorageFill contents: + - id: ClothingNeckCloakQm - id: BoxFolderQmClipboard + - id: ClothingHeadsetCargo + - id: ClothingHandsGlovesColorBrown - id: CargoRequestComputerCircuitboard - - id: CargoSaleComputerCircuitboard - id: CargoShuttleComputerCircuitboard - id: CargoShuttleConsoleCircuitboard - id: SalvageShuttleConsoleCircuitboard @@ -15,12 +17,16 @@ - id: CigPackGreen prob: 0.50 - id: DoorRemoteCargo + - id: ADTClothingHeadHatsBeretSupply - id: RubberStampQm - - id: RubberStampDenied - - id: RubberStampApproved - id: ClothingHeadsetAltCargo - id: BoxEncryptionKeyCargo - - id: PrinterDocFlatpack # Corvax-Printer + - id: ADTtelescopicBaton + # Sirena-Underwear-Start + - id: ADTUnderwearBoxQM + # Sirena-Underwear-End + - id: ADTQMJumpskirtWarm + - id: ADTQMJumpsuitWarm - type: entity id: LockerCaptainFilledHardsuit @@ -33,26 +39,41 @@ - id: NukeDisk - id: PinpointerNuclear - id: CaptainIDCard + - id: ClothingHeadHatCaptain + - id: ClothingNeckCloakCap - id: ClothingOuterHardsuitCap - id: ClothingMaskGasCaptain - id: WeaponDisabler - id: CommsComputerCircuitboard - id: ClothingHeadsetAltCommand - - id: SpaceCash1000 + - id: SpaceCash10000 - id: PlushieNuke prob: 0.1 - id: CigarGoldCase prob: 0.25 - id: ClothingBeltSheathFilled - id: DoorRemoteCommand + - id: ClothingNeckCloakCapFormal + - id: ClothingUniformJumpsuitCapFormal + - id: ClothingUniformJumpskirtCapFormalDress - id: RubberStampCaptain - id: WeaponAntiqueLaser - id: JetpackCaptainFilled - id: MedalCase + - id: ClothingHeadHatCapcap + - id: ClothingHeadCaptainHat + - id: ClothingOuterCoatCaptain + - id: ADTtelescopicBaton + # Sirena-Underwear-Start + - id: ADTUnderwearBoxCap + # Sirena-Underwear-End + - id: ADTSwimsuitCap + - id: ADTCapJumpsuitWarm + - id: ADTCapJumpskirtWarm - type: entity id: LockerCaptainFilled - suffix: Filled, AntiqueLaser + suffix: Filled parent: LockerCaptain components: - type: StorageFill @@ -61,24 +82,39 @@ - id: NukeDisk - id: PinpointerNuclear - id: CaptainIDCard + - id: ClothingHeadHatCaptain + - id: ClothingNeckCloakCap + - id: ClothingHandsGlovesCaptain - id: WeaponDisabler - id: CommsComputerCircuitboard - id: ClothingHeadsetAltCommand - - id: SpaceCash1000 + - id: SpaceCash10000 - id: PlushieNuke prob: 0.1 - id: CigarGoldCase prob: 0.25 - id: ClothingBeltSheathFilled - id: DoorRemoteCommand + - id: ClothingNeckCloakCapFormal + - id: ClothingUniformJumpsuitCapFormal + - id: ClothingUniformJumpskirtCapFormalDress - id: RubberStampCaptain - id: WeaponAntiqueLaser - id: JetpackCaptainFilled - id: MedalCase + - id: ClothingHeadHatCapcap + - id: ADTtelescopicBaton + # Sirena-Underwear-Start + - id: ADTUnderwearBoxCap + # Sirena-Underwear-End # Corvax-Resprite-Start - id: ClothingHeadCaptainHat - id: ClothingOuterCoatCaptain # Corvax-Resprite-End + - id: ADTClothingEyesHudAdvanced #ADT mods + - id: ADTSwimsuitCap + - id: ADTCapJumpsuitWarm + - id: ADTCapJumpskirtWarm - type: entity id: LockerCaptainFilledNoLaser @@ -91,19 +127,38 @@ - id: NukeDisk - id: PinpointerNuclear - id: CaptainIDCard + - id: ClothingHeadHatCaptain + - id: ClothingNeckCloakCap + - id: ClothingHandsGlovesCaptain - id: WeaponDisabler - id: CommsComputerCircuitboard - id: ClothingHeadsetAltCommand - - id: SpaceCash1000 + - id: SpaceCash10000 - id: PlushieNuke prob: 0.1 - id: CigarGoldCase prob: 0.25 - id: ClothingBeltSheathFilled - id: DoorRemoteCommand + - id: ClothingNeckCloakCapFormal + - id: ClothingUniformJumpsuitCapFormal + - id: ClothingUniformJumpskirtCapFormalDress - id: RubberStampCaptain - id: JetpackCaptainFilled - id: MedalCase + - id: ClothingHeadHatCapcap + - id: ADTtelescopicBaton + # Sirena-Underwear-Start + - id: ADTUnderwearBoxCap + # Sirena-Underwear-End + # Corvax-Resprite-Start + - id: ClothingHeadCaptainHat + - id: ClothingOuterCoatCaptain + # Corvax-Resprite-End + - id: ADTClothingEyesHudAdvanced #ADT mods + - id: ADTSwimsuitCap + - id: ADTCapJumpsuitWarm + - id: ADTCapJumpskirtWarm - type: entity id: LockerHeadOfPersonnelFilled @@ -112,13 +167,17 @@ components: - type: StorageFill contents: + - id: ClothingNeckCloakHop + - id: ClothingHeadHatHopcap - id: HoPIDCard - id: ClothingHeadsetCommand - id: BoxPDA - id: BoxID + - id: ADTtelescopicBaton - id: BoxHeadset - id: IDComputerCircuitboard - id: WeaponDisabler + - id: ClothingOuterWinterHoP - id: CigarGoldCase prob: 0.25 # Fuck the HoP they don't deserve fucking cigars. @@ -126,15 +185,19 @@ - id: DoorRemoteService - id: ClothingNeckGoldmedal - id: RubberStampHop - - id: RubberStampDenied - - id: RubberStampApproved - id: BoxEncryptionKeyPassenger - id: BoxEncryptionKeyService - id: ClothingBackpackIan prob: 0.5 - id: ClothingOuterCoatHOP # Corvax-Resprite - id: AccessConfigurator - - id: PrinterDocFlatpack # Corvax-Printer + - id: ADTClothingNeckHoPAltCloak # ADT-Resprite + # Sirena-Underwear-Start + - id: ADTUnderwearBoxHOP + # Sirena-Underwear-End + - id: ADTHOPJumpskirtWarm + - id: ADTHOPJumpsuitWarm + - id: ADTClothingHeadHatsBeretHOP - type: entity id: LockerChiefEngineerFilledHardsuit @@ -145,6 +208,9 @@ contents: - id: ClothingOuterHardsuitEngineeringWhite - id: ClothingMaskBreath + - id: OxygenTankFilled + - id: NitrogenTankFilled + - id: ClothingNeckCloakCe - id: ClothingEyesGlassesMeson - id: ClothingBeltChiefEngineerFilled - id: ClothingShoesBootsMagAdv @@ -153,12 +219,17 @@ prob: 0.15 - id: DoorRemoteEngineering - id: RubberStampCE + - id: ADTtelescopicBaton - id: JetpackVoidFilled - id: ClothingHeadsetAltEngineering - id: BoxEncryptionKeyEngineering - id: AccessConfigurator - id: RCD - id: RCDAmmo + # Sirena-Underwear-Start + - id: ADTUnderwearBoxCE + # Sirena-Underwear-End + - id: ADTClothingHeadHatsBeretCE - type: entity id: LockerChiefEngineerFilled @@ -167,6 +238,8 @@ components: - type: StorageFill contents: + - id: ADTtelescopicBaton + - id: ClothingNeckCloakCe - id: ClothingEyesGlassesMeson - id: ClothingBeltChiefEngineerFilled - id: ClothingHandsGlovesColorYellow @@ -179,6 +252,12 @@ - id: AccessConfigurator - id: RCD - id: RCDAmmo + # Sirena-Underwear-Start + - id: ADTUnderwearBoxCE + # Sirena-Underwear-End + - id: ADTCEJumpskirtWarm + - id: ADTCEJumpsuitWarm + - id: ADTClothingHeadHatsBeretCE - type: entity id: LockerChiefMedicalOfficerFilledHardsuit @@ -197,11 +276,30 @@ - id: ClothingHeadHatBeretCmo - id: ClothingOuterHardsuitMedical - id: Hypospray + - id: ADTBookNewChemicals + - id: ADTReagentAnalyzer + - id: ADTMobileDefibrillator + - id: ADTBriefcaseMedical - id: HandheldCrewMonitor - id: DoorRemoteMedical - id: RubberStampCMO + - id: ADTtelescopicBaton - id: MedicalTechFabCircuitboard - id: BoxEncryptionKeyMedical + # id: ADTMindShieldImplanter + # amount: 2 + - id: ADTCMOJumpskirtWarm + - id: ADTCMOJumpsuitWarm + - id: MaterialBiomass + amount: 3 + - id: TrackingImplanter + amount: 2 + # Sirena-Underwear-Start + - id: ADTUnderwearBoxCMO + # Sirena-Underwear-End + - id: ADTBriefcaseBrownHikingCmo + - id: ADTClothingBeltMedicalBagFilled + - type: entity id: LockerChiefMedicalOfficerFilled @@ -214,14 +312,36 @@ - id: ClothingHandsGlovesNitrile - id: ClothingEyesHudMedical - id: ClothingHeadsetAltMedical + - id: ClothingCloakCmo - id: ClothingBackpackDuffelSurgeryFilled + - id: ClothingOuterCoatLabCmo - id: ClothingMaskSterile + - id: ClothingHeadHatBeretCmo - id: Hypospray + - id: ADTBookNewChemicals + - id: ADTReagentAnalyzer + - id: ADTMobileDefibrillator + - id: ADTBriefcaseMedical - id: HandheldCrewMonitor - id: DoorRemoteMedical - id: RubberStampCMO + - id: ADTtelescopicBaton - id: MedicalTechFabCircuitboard + - id: ADTCMOJumpskirtWarm + - id: ADTCMOJumpsuitWarm + - id: MaterialBiomass + amount: 3 + - id: TrackingImplanter + amount: 2 + # id: ADTMindShieldImplanter + # amount: 2 + - id: NitrousOxideTankFilled - id: BoxEncryptionKeyMedical + # Sirena-Underwear-Start + - id: ADTUnderwearBoxCMO + # Sirena-Underwear-End + - id: ADTBriefcaseBrownHikingCmo + - id: ADTClothingBeltMedicalBagFilled - type: entity id: LockerResearchDirectorFilledHardsuit @@ -233,13 +353,22 @@ - id: ResearchComputerCircuitboard - id: ProtolatheMachineCircuitboard - id: CircuitImprinterMachineCircuitboard + - id: ClothingNeckCloakRd + - id: ClothingHeadsetMedicalScience - id: ClothingOuterHardsuitRd - id: HandTeleporter - id: DoorRemoteResearch + - id: ClothingHeadHatBeretRND + - id: ClothingHandsGlovesColorPurple - id: ClothingBeltUtilityFilled - id: RubberStampRd - - id: BoxEncryptionKeyScience + - id: ADTtelescopicBaton - id: ClothingHeadsetAltScience + - id: BoxEncryptionKeyScience + - id: BoxEncryptionKeyRobo + # Sirena-Underwear-Start + - id: ADTUnderwearBoxRD + # Sirena-Underwear-End - id: EncryptionKeyBinary - type: entity @@ -249,17 +378,20 @@ components: - type: StorageFill contents: + - id: ADTtelescopicBaton - id: ResearchComputerCircuitboard - id: ProtolatheMachineCircuitboard - id: CircuitImprinterMachineCircuitboard + - id: ClothingNeckCloakRd + - id: ClothingHeadsetMedicalScience - id: HandTeleporter - id: DoorRemoteResearch + - id: ClothingHeadHatBeretRND + - id: ClothingHandsGlovesColorPurple - id: ClothingBeltUtilityFilled - id: RubberStampRd - - id: BoxEncryptionKeyScience -<<<<<<< HEAD - id: ClothingHeadsetAltScience -======= + - id: BoxEncryptionKeyScience - id: BoxEncryptionKeyRobo # Sirena-Add-Start - id: ADTUnderwearBoxRD @@ -312,68 +444,59 @@ # Sirena-Underwear-Start - id: ADTUnderwearBoxRD # Sirena-Underwear-End ->>>>>>> d5129af200 (Added Manual Anomaly Finder (#40)) - id: EncryptionKeyBinary - type: entity - id: LockerHeadOfSecurityFilledHardsuit - suffix: Filled, Hardsuit + id: LockerHeadOfSecurityFilled + suffix: Filled parent: LockerHeadOfSecurity components: - type: StorageFill contents: + - id: ClothingEyesHudSecurity + - id: NesSecurityShuttleConsoleCircuitboard - id: WeaponDisabler + - id: ClothingHeadHatBeretHoS - id: ClothingHeadHatCapHoS # Corvax-SecFashion prob: 0.5 + - id: ClothingHeadHatHoshat + - id: ClothingNeckCloakHos - id: ClothingOuterCoatHoSTrench - - id: ClothingMaskNeckGaiter - id: ClothingOuterCoatHoSGreatcoat # Corvax-Resprite - - id: ClothingOuterHardsuitSecurityRed - - id: ClothingMaskGasSwat + - id: ADTHOSJumpskirtWarm + - id: ADTHOSJumpsuitWarm + - id: ClothingUniformJumpsuitHoSBlue + prob: 0.5 + - id: ClothingUniformJumpsuitHoSGrey + prob: 0.5 + - id: ClothingUniformJumpsuitHoSParadeMale + prob: 0.1 + - id: ClothingUniformJumpskirtHoSParadeMale + prob: 0.1 # - id: ClothingShoeSlippersDuck # Corvax-Resprite: Need more space for style # prob: 0.2 - id: DrinkVacuumFlask prob: 0.8 - id: ClothingBeltSecurityFilled - id: ClothingHeadsetAltSecurity - - id: ClothingEyesGlassesSecurity + - id: ClothingEyesGlassesSunglasses - id: ClothingShoesBootsJack - id: CigarGoldCase prob: 0.50 - id: DoorRemoteSecurity + - id: ClothingUniformJumpskirtHosFormal + - id: ClothingUniformJumpsuitHosFormal - id: RubberStampHos - id: SecurityTechFabCircuitboard - - id: JetpackSecurityFilled - id: BoxEncryptionKeySecurity - id: HoloprojectorSecurity - id: BookSecretDocuments - - id: BookBusido # Corvax-Books + - id: WeaponRevolverUnica #ADTrevolver + - id: ADTWeaponPistolX01 #ADTmultiphase + # Sirena-Underwear-Start + - id: ADTUnderwearBoxHOS + # Sirena-Underwear-End -- type: entity - id: LockerHeadOfSecurityFilled - suffix: Filled - parent: LockerHeadOfSecurity - components: - - type: StorageFill - contents: - - id: WeaponDisabler - - id: ClothingHeadHatCapHoS # Corvax-SecFashion - prob: 0.5 - - id: ClothingOuterCoatHoSTrench - - id: ClothingMaskNeckGaiter - - id: ClothingOuterCoatHoSGreatcoat # Corvax-Resprite - - id: ClothingBeltSecurityFilled - - id: ClothingHeadsetAltSecurity - - id: ClothingEyesGlassesSecurity - - id: ClothingShoesBootsJack - - id: CigarGoldCase - prob: 0.50 - - id: DoorRemoteSecurity - - id: RubberStampHos - - id: SecurityTechFabCircuitboard - - id: BoxEncryptionKeySecurity - - id: HoloprojectorSecurity - - id: BookSecretDocuments - type: entity id: LockerFreezerVaultFilled diff --git a/Resources/Prototypes/Sirena/Entities/Objects/Specific/Research/anomaly.yml b/Resources/Prototypes/Sirena/Entities/Objects/Specific/Research/anomaly.yml index 87232849f82..20efbd4d320 100644 --- a/Resources/Prototypes/Sirena/Entities/Objects/Specific/Research/anomaly.yml +++ b/Resources/Prototypes/Sirena/Entities/Objects/Specific/Research/anomaly.yml @@ -1,22 +1,20 @@ - type: entity - parent: BaseItem + parent: PinpointerBase id: AnomalyPinpointer name: M.A.F. description: Manual Anomaly Finder. Shows where this freaking anomaly is. Amazing! components: - - type: Transform - noRot: True - type: Sprite - netsync: false - noRot: True sprite: Objects/Devices/pinpointer.rsi layers: - - state: pinpointer_anomaly - map: ["enum.PinpointerLayers.Base"] - - state: pinonnull - map: ["enum.PinpointerLayers.Screen"] - - type: Item - sprite: Objects/Devices/pinpointer.rsi + - state: pinpointer-anomaly + - type: Icon + state: pinpointer-anomaly - type: Pinpointer component: Anomaly + - type: Tag + tags: + - HighRiskItem + - type: StealTarget + stealGroup: AnomalyPinpointer diff --git a/Resources/Prototypes/Sirena/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Sirena/Objectives/stealTargetGroups.yml new file mode 100644 index 00000000000..7c2d6b0752a --- /dev/null +++ b/Resources/Prototypes/Sirena/Objectives/stealTargetGroups.yml @@ -0,0 +1,6 @@ +- type: stealTargetGroup + id: AnomalyPinpointer + name: M.A.F. + sprite: + sprite: Objects/Devices/pinpointer.rsi + state: pinpointer-anomaly diff --git a/Resources/Prototypes/Sirena/Objectives/traitorObjectives.yml b/Resources/Prototypes/Sirena/Objectives/traitorObjectives.yml index 5d86aa27636..3b764566906 100644 --- a/Resources/Prototypes/Sirena/Objectives/traitorObjectives.yml +++ b/Resources/Prototypes/Sirena/Objectives/traitorObjectives.yml @@ -1,15 +1,7 @@ -- type: objective - id: AnomalyPinpointerStealObjective - issuer: syndicate - difficultyOverride: 2.75 - requirements: - - !type:TraitorRequirement {} - - !type:IncompatibleConditionsRequirement - conditions: - - DieCondition - - !type:NotRoleRequirement - roleId: ResearchDirector - conditions: - - !type:StealCondition - prototype: AnomalyPinpointer - owner: job-name-rd +- type: entity + noSpawn: true + parent: BaseRDStealObjective + id: RDPinpointerStealObjective + components: + - type: StealCondition + stealGroup: AnomalyPinpointer diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json b/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json index 796fb8c2aa4..9095d963eb5 100644 --- a/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json @@ -156,6 +156,9 @@ { "name": "pinpointer-station" }, + { + "name": "pinpointer-anomaly" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer_anomaly.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-anomaly.png similarity index 100% rename from Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer_anomaly.png rename to Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-anomaly.png