From 9e0315d3fab9956f7fc305dc2c7454cfad0c3e51 Mon Sep 17 00:00:00 2001 From: Elst28 <129709997+Elst28@users.noreply.github.com> Date: Tue, 22 Aug 2023 17:04:12 +0300 Subject: [PATCH] =?UTF-8?q?=D0=AD=D1=81=D0=BA=D0=B0=D0=B4=D1=80=D0=BE?= =?UTF-8?q?=D0=BD=20=D0=B0=D0=BF=D0=B4=D0=B5=D0=B9=D1=82=20(#223)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ghost/roles/ghost-role-component.ftl | 2 + .../catalog/fills/boxes/general.ftl | 5 +- .../catalog/fills/items/firstaidkits.ftl | 3 + .../entities/clothing/back/backpacks.ftl | 3 + .../entities/mobs/player/humanoid.ftl | 3 + .../objects/specific/medical/hypospray.ftl | 8 ++- .../Fills/Backpacks/StarterGear/backpack.yml | 17 +++++ .../Catalog/Fills/Boxes/general.yml | 19 +++++- .../Catalog/Fills/Items/firstaidkits.yml | 13 ++++ .../Entities/Mobs/Player/humanoid.yml | 27 ++++++++ .../Objects/Specific/Medical/hypospray.yml | 60 +++++++++++++++++- .../Roles/Jobs/Fun/misc_startinggear.yml | 4 +- .../Textures/Markers/jobs.rsi/death_squad.png | Bin 0 -> 659 bytes Resources/Textures/Markers/jobs.rsi/meta.json | 3 + 14 files changed, 161 insertions(+), 6 deletions(-) create mode 100644 Resources/Textures/Markers/jobs.rsi/death_squad.png diff --git a/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl b/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl index 828cae46a6332b..efdfe2d6bda688 100644 --- a/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl @@ -101,6 +101,8 @@ ghost-role-information-ert-medical-name = ОБР Медик ghost-role-information-ert-medical-description = Помогите в решении проблем станции обеспечением её медицинской помощью. ghost-role-information-cburn-agent-name = Агент РХБЗЗ ghost-role-information-cburn-agent-description = Высококвалифицированный агент ЦентКом, способный справляться с различными угрозами. +ghost-role-information-death-squad-name = Офицер эскадрона смерти +ghost-role-information-death-squad-description = Уничтожьте станцию, любыми доступными вам методами. ghost-role-information-centcom-official-name = Представитель ЦентКом ghost-role-information-centcom-official-description = Проинспектируйте станцию, запишите отзывы о работе глав отделов, прослушайте Капитана. ghost-role-information-behonker-name = Бехонкер diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/general.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/general.ftl index 778fd7e3d370bd..d03cc76cad58a6 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/general.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/general.ftl @@ -28,6 +28,9 @@ ent-BoxMesonScanners = коробка инженерных очков ent-BoxMRE = И.Р.П. .desc = Коробка старых военных пайков. Они, на удивление, не испортились. .suffix = { "" } +ent-BoxAMRE = П.И.Р.П. + .desc = Коробка армейских пайков нового поколения, подназначенных для питания в условиях агрессивной внешней среды. + .suffix = { "" } ent-BoxHugHealing = коробка обнимашек .desc = Специальная коробка для чутких людей. .suffix = { "" } @@ -81,4 +84,4 @@ ent-BoxArtifactMiners = коробка шахтерского артефакта .suffix = { "" } ent-BoxCursedKatana = коробка с проклятой катаной .desc = Содержит в себе ужасающий осколок неизвестного происхождения. - .suffix = { "" } \ No newline at end of file + .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/firstaidkits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/firstaidkits.ftl index 837ebbe5477faf..f4622bc08404c3 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/firstaidkits.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/firstaidkits.ftl @@ -22,6 +22,9 @@ ent-MedkitAdvancedFilled = { ent-MedkitAdvanced } ent-MedkitCombatFilled = { ent-MedkitCombat } .suffix = Заполненная .desc = { ent-MedkitCombat.desc } +ent-MedkitDeathsquadFilled = { ent-MedkitCombat } + .suffix = Эскадрон Смерти,Заполненная + .desc = { ent-MedkitCombat.desc } ent-StimkitFilled = { ent-Medkit } .suffix = Стимкит, Заполненная .desc = { ent-Medkit.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/backpacks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/backpacks.ftl index c5549176856c9e..d9a13092fad167 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/backpacks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/backpacks.ftl @@ -73,6 +73,9 @@ ent-ClothingBackpackERTJanitor = рюкзак уборщика ОБР ent-ClothingBackpackERTClown = рюкзак клоуна ОБР .desc = Вместительный рюкзак с множеством карманов, который носят клоуны отряда быстрого реагирования. .suffix = { "" } +ent-ClothingBackpackDeathsquad = рюкзак эскадрона смерти + .desc = Вместительный рюкзак с множеством карманов, который носят члены эскадрона смерти. + .suffix = { "" } ent-ClothingBackpackHolding = блюспейс рюкзак .desc = Рюкзак, открывающийся в локальный карман блюспейса. .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl index e582757cb388a1..c4fe3633e81fe0 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl @@ -31,6 +31,9 @@ ent-RandomHumanoidSpawnerERTMedicalEVA = ОБР медик ent-RandomHumanoidSpawnerCBURNUnit = Агент РХБЗЗ .desc = { "" } .suffix = { "" } +ent-RandomHumanoidSpawnerDeathSquadOfficer = офицер эскадрона смерти + .desc = { "" } + .suffix = { "" } ent-RandomHumanoidSpawnerCentcomOfficial = представитель ЦентКом .desc = { "" } .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/hypospray.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/hypospray.ftl index 4ae899e787c348..2e8a7b351ce604 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/hypospray.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/hypospray.ftl @@ -31,6 +31,12 @@ ent-StimpackMini = микроинъектор стимуляторов ent-CombatMedipen = боевой медипен .desc = Одноразовый медипен, содержащий химические вещества, заживляющие большинство видов повреждений. .suffix = { "" } +ent-NutrimentMedipen = питательный медипен + .desc = Одноразовый медипен, содержащий питательные вещества, которые удаляют голод. + .suffix = { "" } +ent-SalineMedipen = солевой медипен + .desc = Одноразовый медипен, содержащий солевой раствор, что эффективно утоляет жажду. + .suffix = { "" } ent-Hypopen = ручка .desc = Ручка с чёрными чернилами. .suffix = Гипоручка @@ -39,4 +45,4 @@ ent-HypopenBox = коробка с гипоручкой .suffix = { "" } ent-Luxurymedpen = роскошный медпен .desc = Содержит смесь химических веществ, способных поднять буквально с того света. - .suffix = { "" } \ No newline at end of file + .suffix = { "" } diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index d1fd814c945260..daf5c9eb9c0bcc 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -334,3 +334,20 @@ - id: Cutlass - id: WeaponRevolverPirate - id: ClothingEyesEyepatch + +- type: entity + parent: ClothingBackpackERTSecurity + id: ClothingBackpackDeathsquad + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: WeaponRevolverMateba + - id: WeaponPulseRifle + - id: SpeedLoaderMagnumAP + - id: MagazineBoxMagnum + - id: C4 + - id: C4 + - id: MedkitDeathsquadFilled + - id: BoxAMRE + - id: MicroBombImplanter diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index d9780dbed2d1b2..7249d24bb56886 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -185,6 +185,23 @@ - state: box_olive - state: writing +- type: entity + name: A.M.R.E. + parent: BoxCardboard + id: BoxAMRE + description: A box of new generation army rations. + components: + - type: StorageFill + contents: + - id: SalineMedipen + amount: 3 + - id: NutrimentMedipen + amount: 3 + - type: Sprite + layers: + - state: box_olive + - state: dna + - type: entity name: box of hugs parent: BoxCardboard @@ -435,4 +452,4 @@ - type: StorageFill contents: - id: KatanacursedShard - - id: ClothingOuterDogi \ No newline at end of file + - id: ClothingOuterDogi diff --git a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml index 9aab4ce40885c0..c3aa85bebc8d27 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml @@ -127,3 +127,16 @@ contents: - id: StimpackMini amount: 6 + +- type: entity + id: MedkitDeathsquadFilled + suffix: Filled + parent: MedkitCombat + components: + - type: StorageFill + contents: + - id: HandheldHealthAnalyzer + - id: CombatMedipen + amount: 3 + - id: Stimpack + amount: 3 diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index 6aa53f6875edc2..9319758ddfb9ad 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -299,6 +299,33 @@ nameSegments: - NamesFirstMilitary - names_last +## Death Squad + +- type: entity + id: RandomHumanoidSpawnerDeathSquadOfficer + name: Death Squad officer + components: + - type: Sprite + netsync: false + sprite: Markers/jobs.rsi + state: death_squad + - type: RandomHumanoidSpawner + settings: DSOfficer + +- type: randomHumanoidSettings + id: DSOfficer + components: + - type: Loadout + prototypes: [ DeathSquadGear ] + - type: GhostRole + name: ghost-role-information-death-squad-name + description: ghost-role-information-death-squad-description + - type: GhostTakeoverAvailable + - type: RandomMetadata + nameSegments: + - NamesFirstMilitary + - names_last + ## Central Command - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index 890b783cefb8f4..dfa07cfafcf4c6 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -296,6 +296,64 @@ - type: Tag tags: [] +- type: entity + name: nutriment medipen + parent: ChemicalMedipen + id: NutrimentMedipen + description: A single-use medipen containing nutriment. + components: + - type: Sprite + sprite: Objects/Specific/Medical/medipen.rsi + layers: + - state: hypovolemic + map: [ "enum.SolutionContainerLayers.Fill" ] + - type: Item + sprite: Objects/Specific/Medical/medipen.rsi + size: 5 + - type: SolutionContainerManager + solutions: + pen: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 30 + - type: Hypospray + solutionName: pen + transferAmount: 10 + - type: StaticPrice + price: 250 + - type: Tag + tags: [] + +- type: entity + name: salin medipen + parent: ChemicalMedipen + id: SalineMedipen + description: A single-use medipen containing saline. + components: + - type: Sprite + sprite: Objects/Specific/Medical/medipen.rsi + layers: + - state: morphen + map: ["enum.SolutionContainerLayers.Fill"] + - type: Item + sprite: Objects/Specific/Medical/medipen.rsi + size: 5 + - type: SolutionContainerManager + solutions: + pen: + maxVol: 30 + reagents: + - ReagentId: Saline + Quantity: 30 + - type: Hypospray + solutionName: pen + transferAmount: 10 + - type: StaticPrice + price: 200 + - type: Tag + tags: [] + - type: entity name: pen suffix: Hypopen @@ -331,7 +389,7 @@ path: /Audio/Effects/unwrap.ogg - type: entity - name: Luxury Medipen + name: Luxury Medipen parent: ChemicalMedipen id: Luxurymedpen description: Contains enough stimulants for you to have the chemical's effect for 30 seconds. Use it when you're sure you're ready to throw down. diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index bd030e9d26ff71..ee8363f812050b 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -39,13 +39,13 @@ id: DeathSquadGear equipment: jumpsuit: ClothingUniformJumpsuitDeathSquad - back: ClothingBackpackDuffelSyndicateAmmo + back: ClothingBackpackDeathsquad mask: ClothingMaskGasDeathSquad eyes: ClothingEyesGlassesSecurity ears: ClothingHeadsetAltCentCom gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitDeathsquad - suitstorage: OxygenTankFilled + suitstorage: JetpackVoidFilled shoes: ClothingShoesBootsMagAdv id: DeathsquadPDA pocket1: EnergySword diff --git a/Resources/Textures/Markers/jobs.rsi/death_squad.png b/Resources/Textures/Markers/jobs.rsi/death_squad.png new file mode 100644 index 0000000000000000000000000000000000000000..15343109cc78a3803fe40f7e5bf6d6d8285daa34 GIT binary patch literal 659 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil81AIbUMMOk2H8m9!6iiG^8pXwzF)(B?FoaJyRl4lDwzhUu=XPUbV+{=r zIXSs_Zf-?IMMp=+i3|)8(#&RNX0o!f`uh5!qM|a=(#p!pmX?gwutc6JsP7UJUKhK7d0!NCRw20;5$`+wU4Db11~zu^Bw0*0V33hh8m zoCO|{#S9F5M?jcysy3fA(6c$7E{-7<{;mDpvzinHS{v{5=t{W+DCy6Pt@y8g=c32P z*!{Nid(M4)ZXoc#-;Tk_u3V?ei$l4k?cGv|1u2tjRA;LSGViE8y)DAoUMou@SyMV( zW+TI;l6J3f#zXrr$Ikk6RN!Of6oYNaIk_kPHg-MPVXf9A_wAswFGItW5Sf#K0h)|W z(#$g_?POz^>pk@^V@80RIETnBjSC0oGHSG5tDMKIx7O9t)u%xxxACRadCeS6d&Y*z z8^W^ZKHL;GXPM!Bhhz5(pyO^C;>?asL-3m?r z&R7v{>TCPvSjVnRE%84b2UvIx9A*@*W4>p(XXS$~?mdfV|2u!cBIBf`{&Pn5qYZ{^ zjBB(VW^a9aG(M_^J^cbxKW3lO-;x*b0%cmqUUAxfV#gJ|O z_w4;&y;~1TnlP7F)_(E-|3*H%l3y;1ZJtJVgREWC^S%EWw`kY4M!wN&0Y(Ocr>mdK II;Vst03^!>c>n+a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Markers/jobs.rsi/meta.json b/Resources/Textures/Markers/jobs.rsi/meta.json index 2401b27be7d0d5..004f0e65acf4ad 100644 --- a/Resources/Textures/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/Markers/jobs.rsi/meta.json @@ -168,6 +168,9 @@ }, { "name": "warden" + }, + { + "name": "death_squad" }, { "name": "cluwne"