From c0713de493c7ddd17c8e2082ed118869a95046ec Mon Sep 17 00:00:00 2001 From: kingmonkeyx Date: Fri, 24 Mar 2023 19:32:01 +0000 Subject: [PATCH] Added Manual Anomaly Finder (#40) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавлен Р.П.А. - ручной поисковик аномалий (by That_is_not_Sloni122). Пинпоинтер, что указывает на все сущности с компонентом `Anomaly`. Также он добавлен в шкаф научрука. А ещё добавлена триторская цель на него. *P.S. сборка не проверялась. Тесты не проводились.* Co-authored-by: kingmonkeyx Reviewed-on: https://codeberg.org/NekoDar/SS14-Sirena/pulls/40 Co-authored-by: kingmonkeyx Co-committed-by: kingmonkeyx --- .../objects/specific/research/anomaly.ftl | 2 + .../Catalog/Fills/Lockers/heads.yml | 55 +++++++++++++++++++ .../Objects/Specific/Research/anomaly.yml | 22 ++++++++ .../Sirena/Objectives/traitorObjectives.yml | 15 +++++ 4 files changed, 94 insertions(+) create mode 100644 Resources/Locale/ru-RU/sirena/entities/objects/specific/research/anomaly.ftl create mode 100644 Resources/Prototypes/Sirena/Entities/Objects/Specific/Research/anomaly.yml create mode 100644 Resources/Prototypes/Sirena/Objectives/traitorObjectives.yml diff --git a/Resources/Locale/ru-RU/sirena/entities/objects/specific/research/anomaly.ftl b/Resources/Locale/ru-RU/sirena/entities/objects/specific/research/anomaly.ftl new file mode 100644 index 00000000000..a08442b6965 --- /dev/null +++ b/Resources/Locale/ru-RU/sirena/entities/objects/specific/research/anomaly.ftl @@ -0,0 +1,2 @@ +ent-AnomalyPinpointer = Р.П.А. + .desc = Ручной Поисковик Аномалий. Показывает, где эта долбанная аномалия. Восхитительно! diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index d4d415854b3..56a7773c92d 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -257,7 +257,62 @@ - id: ClothingBeltUtilityFilled - id: RubberStampRd - id: BoxEncryptionKeyScience +<<<<<<< HEAD - id: ClothingHeadsetAltScience +======= + - id: BoxEncryptionKeyRobo + # Sirena-Add-Start + - id: ADTUnderwearBoxRD + - id: SirenaAnomalyPinpointer + # Sirena-Add-End + - id: EncryptionKeyBinary + +- type: entity + id: LockerHeadOfSecurityFilledHardsuit + suffix: Filled, Hardsuit + parent: LockerHeadOfSecurity + components: + - type: StorageFill + contents: + - id: NesSecurityShuttleConsoleCircuitboard + - id: ClothingEyesHudSecurity + - id: WeaponDisabler + - id: ClothingHeadHatBeretHoS + - id: ClothingHeadHatCapHoS # Corvax-SecFashion + prob: 0.5 + - id: ClothingHeadHatHoshat + - id: ClothingNeckCloakHos + - id: ClothingOuterCoatHoSTrench + - id: ClothingOuterCoatHoSGreatcoat # Corvax-Resprite + - id: ADTHOSJumpsuitWarm + - id: ADTHOSJumpskirtWarm + - id: ClothingOuterHardsuitSecurityRed + - id: ClothingMaskGasSwat +# - id: ClothingShoeSlippersDuck # Corvax-Resprite: Need more space for style +# prob: 0.2 + - id: DrinkVacuumFlask + prob: 0.8 + - id: ClothingBeltSecurityFilled + - id: ClothingHeadsetAltSecurity + - 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: WeaponRevolverUnica #ADTrevolver + - id: ADTWeaponPistolX01 #ADTmultiphase + # Sirena-Underwear-Start + - id: ADTUnderwearBoxRD + # Sirena-Underwear-End +>>>>>>> d5129af200 (Added Manual Anomaly Finder (#40)) - id: EncryptionKeyBinary - type: entity diff --git a/Resources/Prototypes/Sirena/Entities/Objects/Specific/Research/anomaly.yml b/Resources/Prototypes/Sirena/Entities/Objects/Specific/Research/anomaly.yml new file mode 100644 index 00000000000..a500bfa88fe --- /dev/null +++ b/Resources/Prototypes/Sirena/Entities/Objects/Specific/Research/anomaly.yml @@ -0,0 +1,22 @@ +- type: entity + parent: BaseItem + 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_crew + map: ["enum.PinpointerLayers.Base"] + - state: pinonnull + map: ["enum.PinpointerLayers.Screen"] + - type: Item + sprite: Objects/Devices/pinpointer.rsi + - type: Pinpointer + component: Anomaly + - type: Appearance diff --git a/Resources/Prototypes/Sirena/Objectives/traitorObjectives.yml b/Resources/Prototypes/Sirena/Objectives/traitorObjectives.yml new file mode 100644 index 00000000000..5d86aa27636 --- /dev/null +++ b/Resources/Prototypes/Sirena/Objectives/traitorObjectives.yml @@ -0,0 +1,15 @@ +- 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