From 96b48dc133b9530c60a9ff342e5a68c7534d9716 Mon Sep 17 00:00:00 2001 From: EstKemran Date: Tue, 17 Sep 2024 23:05:32 +0300 Subject: [PATCH 01/47] hardsuit --- .../Clothing/OuterClothing/hardsuits.yml | 29 ++++- .../Clothing/Head/hardsuit-helmets.yml | 54 ++++++++++ .../Clothing/OuterClothing/hardsuits.yml | 100 ++++++++++++++++++ .../dq_alpha_helmet.rsi/icon-flash.png | Bin 0 -> 769 bytes .../Hardsuits/dq_alpha_helmet.rsi/icon.png | Bin 0 -> 322 bytes .../Hardsuits/dq_alpha_helmet.rsi/meta.json | 41 +++++++ .../off-equipped-HELMET.png | Bin 0 -> 974 bytes .../dq_alpha_helmet.rsi/off-inhand-left.png | Bin 0 -> 1016 bytes .../dq_alpha_helmet.rsi/off-inhand-right.png | Bin 0 -> 1064 bytes .../on-equipped-HELMET.png | Bin 0 -> 1705 bytes .../dq_alpha_helmet.rsi/on-inhand-left.png | Bin 0 -> 1543 bytes .../dq_alpha_helmet.rsi/on-inhand-right.png | Bin 0 -> 1559 bytes .../dq_helmet_commander.rsi/icon-flash.png | Bin 0 -> 769 bytes .../dq_helmet_commander.rsi/icon.png | Bin 0 -> 322 bytes .../dq_helmet_commander.rsi/meta.json | 41 +++++++ .../off-equipped-HELMET.png | Bin 0 -> 981 bytes .../off-inhand-left.png | Bin 0 -> 1016 bytes .../off-inhand-right.png | Bin 0 -> 1064 bytes .../on-equipped-HELMET.png | Bin 0 -> 1716 bytes .../on-inhand-left.png | Bin 0 -> 1543 bytes .../on-inhand-right.png | Bin 0 -> 1559 bytes .../equipped-OUTERCLOTHING.png | Bin 0 -> 2588 bytes .../Hardsuits/dq_alpha_hardsuit.rsi/icon.png | Bin 0 -> 950 bytes .../dq_alpha_hardsuit.rsi/inhand-left.png | Bin 0 -> 819 bytes .../dq_alpha_hardsuit.rsi/inhand-right.png | Bin 0 -> 851 bytes .../Hardsuits/dq_alpha_hardsuit.rsi/meta.json | 26 +++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 2643 bytes .../dq_hardsuit_commander.rsi/icon.png | Bin 0 -> 950 bytes .../dq_hardsuit_commander.rsi/inhand-left.png | Bin 0 -> 819 bytes .../inhand-right.png | Bin 0 -> 851 bytes .../dq_hardsuit_commander.rsi/meta.json | 26 +++++ 31 files changed, 312 insertions(+), 5 deletions(-) create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/icon-flash.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/meta.json create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/off-equipped-HELMET.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/off-inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/off-inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/on-equipped-HELMET.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/on-inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/on-inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/icon-flash.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/meta.json create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/off-equipped-HELMET.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/off-inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/off-inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/on-equipped-HELMET.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/on-inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/on-inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/meta.json create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 8c9dc4fa2ceeaf..7c87d0188a792d 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -971,16 +971,35 @@ - type: Armor modifiers: coefficients: - Blunt: 0.1 #best armor in the game - Slash: 0.1 - Piercing: 0.1 - Heat: 0.1 + #SS220-Deathsquad-Update-Begin + Blunt: 0.3 + Slash: 0.3 + Piercing: 0.2 + Heat: 0.3 Radiation: 0.1 Stamina: 0.1 Caustic: 0.1 + #SS220-Deathsquad-Update-End - type: ClothingSpeedModifier walkModifier: 1.0 - sprintModifier: 1.0 + sprintModifier: 1.2 #SS220-Deathsquad-Update + #SS220-Deathsquad-Update-Begin + - type: GasTank + outputPressure: 101.3 + air: + volume: 20 + moles: + - 10.451303391 # 22% oxygen + - 11.600075659 # 78% nitrogen + # 32.051379050 total = ~60 min + temperature: 293.15 + tankLowPressure: 30.0 + - type: PointLight + color: SkyBlue + radius: 1.5 + energy: 0.3 + netsync: false + #SS220-Deathsquad-Update-End - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitDeathsquad diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/SS220/Entities/Clothing/Head/hardsuit-helmets.yml index feb09986fb48d6..37f9cb7c391397 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Head/hardsuit-helmets.yml @@ -49,3 +49,57 @@ Blunt: 0.8 Slash: 0.8 Piercing: 0.8 + +# Death Squad Commander Hardsuit +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitDeathsquadCommander + name: шлем командира ЭС + description: Шлем от костюм командира ЭС. + components: + - type: BreathMask + - type: Sprite + sprite: SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi + - type: Clothing + sprite: SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi + - type: PointLight + color: cyan + - type: PressureProtection + highPressureMultiplier: 0.08 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.80 + Slash: 0.80 + Piercing: 0.80 + Heat: 0.80 + Radiation: 0.80 + Caustic: 0.95 + +# Death Squad Alpha Hardsuit +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitDeathsquadAlpha + name: шлем специалиста ЭС + description: Шлем от скафандра специалиста ЭС + components: + - type: BreathMask + - type: Sprite + sprite: SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi + - type: Clothing + sprite: SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi + - type: PointLight + color: cyan + - type: PressureProtection + highPressureMultiplier: 0.08 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.80 + Slash: 0.80 + Piercing: 0.80 + Heat: 0.80 + Radiation: 0.80 + Caustic: 0.95 diff --git a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml index 46f48eb64c3b5a..3a5f2356eec1d8 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml @@ -63,3 +63,103 @@ - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitSecurityPilot + +# Death Squad Commander Hardsuit +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitDeathsquadCommander + name: скафандр командира ЭС + description: Высокотехнологичный скафандр, предназначенный для командира отряда. + components: + - type: Sprite + sprite: SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi + - type: Clothing + sprite: SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi + - type: PressureProtection + highPressureMultiplier: 0.02 + lowPressureMultiplier: 1000 + - type: TemperatureProtection + coefficient: 0.001 + - type: ExplosionResistance + damageCoefficient: 0.2 + - type: Armor + modifiers: + coefficients: + Blunt: 0.2 + Slash: 0.2 + Piercing: 0.2 + Heat: 0.2 + Radiation: 0.1 + Stamina: 0.1 + Caustic: 0.1 + - type: ClothingSpeedModifier + walkModifier: 1 + sprintModifier: 1.1 + - type: HeldSpeedModifier + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitDeathsquadCommander + - type: GasTank + outputPressure: 101.3 + air: + volume: 20 + moles: + - 10.451303391 # 22% oxygen + - 11.600075659 # 78% nitrogen + # 32.051379050 total = ~60 min + temperature: 293.15 + tankLowPressure: 30.0 + - type: PointLight + color: SkyBlue + radius: 1.5 + energy: 0.3 + netsync: false + +# Death Squad Alpha Hardsuit +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitDeathsquadAlpha + name: скафандр специалиста ЭС + description: Высокотехнологичный скафандр предназначенный для специалистов отряда. + components: + - type: Sprite + sprite: SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi + - type: Clothing + sprite: SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi + - type: PressureProtection + highPressureMultiplier: 0.02 + lowPressureMultiplier: 1000 + - type: TemperatureProtection + coefficient: 0.001 + - type: ExplosionResistance + damageCoefficient: 0.4 + - type: Armor + modifiers: + coefficients: + Blunt: 0.4 + Slash: 0.4 + Piercing: 0.3 + Heat: 0.3 + Radiation: 0.1 + Stamina: 0.1 + Caustic: 0.1 + - type: ClothingSpeedModifier + walkModifier: 1 + sprintModifier: 1.4 + - type: HeldSpeedModifier + - type: GasTank + outputPressure: 101.3 + air: + volume: 20 + moles: + - 10.451303391 # 22% oxygen + - 11.600075659 # 78% nitrogen + # 32.051379050 total = ~60 min + temperature: 293.15 + tankLowPressure: 30.0 + - type: PointLight + color: SkyBlue + radius: 1.5 + energy: 0.3 + netsync: false + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitDeathsquadAlpha diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/icon-flash.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/icon-flash.png new file mode 100644 index 0000000000000000000000000000000000000000..a4cc77a73cba0e3da04f35ee156ca17751e6db15 GIT binary patch literal 769 zcmV+c1OEJpP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0+vZcK~z{r?UpfU z6JZp`UoNJ}<(j0)H3?cNHde8NgM)*j#X<*h6Wkmebg8H~=%llY9R$Ha6vWM`sNmF1 za1p11S_B2hsEM{sO4KC2-{lTtN$yS@T<#BlUfz5E_kI85zVC=ch!7#d|3=J>zIf5? z5YT#hVz>A45A@fG-NP}XmkmLn0eADbOIC}Y-G6YSGBqQU&zI>r_;_?)-hX%__g7wy zYT8yZNNoF=@U_>s`H0d~W-lC?+px>qC7sJks#FxSTyi2gb^7RBJ#%q)oq_QGeR}4k(@exbgrH`=7;VRWPnG+0<1cE_tLf1+_>G6!x~5`t(27(GnW=CKPK6tEwRe97}I;5NKTzTI`r<` zKN+CU8E{OjH@=Cb&wAhS1^vkjlAN57l#)nJojyAB?wogc2O`KoKaA#PLlPrNvG*k9 z$eGh3diY}Hq7%uf(?^HinF>IV$h%5El|NdohL|Z!R+k=0t=^QGxmh`IY}Se7)aj!` z@6LHwav*{X@G@bMmU8p@!v`lCYwKd?%kuWwV|n%DDHTv(y^=ZR2fef$gf+lo z-0!aoi#JZad%Ys*geCQARcfu46UnL5N9XF9^EKf6CfxEO;#3!uCFS_-%U74|VoCCa zlGJNe`SPhM7jNA>slCt2swr zD-ddP5NH4lFaf#jTs7((G@f@;$;P2J2cZmrEhb?9J@;-3CfGRC<{-2I&}Ra&x)*79 z*NqrzbMRLNfNO#|ZVYwR}$nG{2v)GxE{E30w}{-;1O92RB#xC8IR|$NC67Ad%8G=SopuaaFDN6 zfyd?Iv~wDZ{``NxZ&j>FuVMcCyM}XIn!il9EBK}^pu6Px&h)G02RCt{2+TUwiWf;KmZ@ML>=A6v_*b+B19NJ+MY*(dtWNbwPr+6cRYc}v= zcOC4X*uT(AVVAoSCW3cjU`jhSyNwxxWRs>GbjGH!Y3PqMF)_Se)DtRfl5@;KhtCJj zMF{74p7(i^b1t42ME}grTIzX=f7HuOsnm@6@bP0dgHcA?JA5`VL80&xxcbdbMUKB&(nR}CnYY-pA_e(5H5r%AQ?D|V;J z@k=+MT|4;RZ_P3Qxe>j40T7OR3g`YA5RNl`@g=yJ=ge4yk+nJ_z`ak(@S>+0dR8jg z5KgjR+h@AEi*Y23-D#2o(1!fqfLJV{m|RqbkyLZrweDpYNyX%%ip3JXz6D~jgwizq zsW~)F_dS0%k!59+VI3o1`rq$@f?>I?|X2M`0sHSV?-}1Ey&f;6|qydy<~8N;XG-$m7(O@3j1B zfWt77O8;q%!I^VJqa$R?XR+dU2z+`Sz}E%d4rDjy4QO8#2F#^kgyZ>P?oac{|V{kCy`Dol>eJe7Rn(01$bv@em*O6(a w)$Z<2_j5lMFN6?62qA literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/off-inhand-left.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/off-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c14f709fe95f94b44f899b08e7d64153735eea43 GIT binary patch literal 1016 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/on-inhand-right.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/on-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..105dfe1d722337780001c22ecfd7820f0fe80132 GIT binary patch literal 1559 zcmV+y2I%>TP)VLLewHIXO5f001bFV_;x1aCC8UWfEXu$jvJ$3UYT+h=`0*U_Z~m#=y(~28qeV z1&#p$J|K2peqJgA2KaW3fe}Ps)&-e`DUTO$B^MNx0O>zKY?P8(oXo($XaHnqmzNX( z#Tn-S*&<2VVD<(OyC@{c8OS~YWb>s%*jGU8BnbNnh+PEq1d#m&q&^+YX5s*w17XX6 z*d?hIAbS~{^9w4AGSf3k6bvmbEfpM7@{>{(f-8$lQge$HJoA$Ciwg3K5=&B3fNCM` z0|P;bLQsfl05w`@lIU-O02B`p*5^QQ_%e!}L5Lwha%oW+l*!0sOqh=_V~zv^ga1+n z29`evF_T^fh6Oqd4E$3OVrqsA38eLVK2GMSXLPrOC=+@$1y7@9Jed#DT*ap6oJy}N?1GloVx5-|V zmHl}d^r3}5t{XDggBw`TYOPx1pENOlG@3*cbMGE*u4XZg=w_SR^Mk{^_uO+Y=ll51 zIp6ud0|J3SAP@)y0)apv5C{Z<=L^ZW8H`4ZXQR$kpuL*CYJk?|bRB5to&*wX32)9R z7N87W2@<-%Dv$;?fs9c~Q3-8rr?l56Cs;(LmK48xTNoP~mI}4CWUmss;AMaeCu$gV0Z&MFkUo&Jssen82#GpwUzXm9V-5{U%KWSkLAVo6IgqDdr^aT19H z?d_dAl#@Ho&47Hn`>J0xn~o z{U7ghG3Eecl0!0?aJoE<-TIU_uYJL}Iv3M(5$=B0gVW_fT{nh*>5czzcnJWXZvt$J zUTIOlH-X*m+IpW$?hwcTnP?=8EGsx1RSaFf2EfquYd9QL$g)B-65eWikizVTKwwsi z$0G&b#p4kIf!SRrLBj$zuiUxmU7VZ3U0s7scJOdEj7@gnuC8HmZi*{+ZhFy|!jiK9 zfVH*Ng2QsR`g}jY22=u-U%%5aT2bYu*?XLalcU6zgM57Z)^T7ZTauKhAFvnlJ;5@d z99`4XSIroYTg?73Ad+~<<(_IC;sHY%sm!@b0l9qNn3D{ z8<#)04^*HhR^(#;|1`fZk zQ_E1_;AMV(n$1*-t{(^6(6h&@z*?8nmD>HUPoJVKAiJI$&Q1b|Ub^vZT_(AKZ*m-U zBaK5T2UtV*1q@3lY4&x<=`f|yi&_Q?aA?x#`#$C-(&&eTzX6}>zq*Qqo)-WB002ov JPDHLkV1k$dy6^x1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/icon-flash.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/icon-flash.png new file mode 100644 index 0000000000000000000000000000000000000000..a4cc77a73cba0e3da04f35ee156ca17751e6db15 GIT binary patch literal 769 zcmV+c1OEJpP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0+vZcK~z{r?UpfU z6JZp`UoNJ}<(j0)H3?cNHde8NgM)*j#X<*h6Wkmebg8H~=%llY9R$Ha6vWM`sNmF1 za1p11S_B2hsEM{sO4KC2-{lTtN$yS@T<#BlUfz5E_kI85zVC=ch!7#d|3=J>zIf5? z5YT#hVz>A45A@fG-NP}XmkmLn0eADbOIC}Y-G6YSGBqQU&zI>r_;_?)-hX%__g7wy zYT8yZNNoF=@U_>s`H0d~W-lC?+px>qC7sJks#FxSTyi2gb^7RBJ#%q)oq_QGeR}4k(@exbgrH`=7;VRWPnG+0<1cE_tLf1+_>G6!x~5`t(27(GnW=CKPK6tEwRe97}I;5NKTzTI`r<` zKN+CU8E{OjH@=Cb&wAhS1^vkjlAN57l#)nJojyAB?wogc2O`KoKaA#PLlPrNvG*k9 z$eGh3diY}Hq7%uf(?^HinF>IV$h%5El|NdohL|Z!R+k=0t=^QGxmh`IY}Se7)aj!` z@6LHwav*{X@G@bMmU8p@!v`lCYwKd?%kuWwV|n%DDHTv(y^=ZR2fef$gf+lo z-0!aoi#JZad%Ys*geCQARcfu46UnL5N9XF9^EKf6CfxEO;#3!uCFS_-%U74|VoCCa zlGJNe`SPhM7jNA>slCt2swr zD-ddP5NH4lFaf#jTs7((G@f@;$;P2J2cZmrEhb?9J@;-3CfGRC<{-2I&}Ra&x)*79 z*NqrzbMRLNfNO#|ZVYwR}$nG{2v)GxE{E30w}{-;1O92RB#xC8IR|$NC67Ad%8G=SopuaaFDN6 zfyd?Iv~wDZ{``NxZ&j>FuVMcCyM}XIn!il9EBK}^pu6Px&k4Z#9RCt{2+QDnvRvZWLZxYLKvE*&G8+&f3_i$jf7|CLi304T1Kwao%Fya<^ zD7yr@V^6*8lD}ZbUPrHm!fvI7tn84Gb!4s>ZbBW@LEX{CPN^K#s#EW`L$OF9VU}vK zmi<1UgKhMFzu$X$PlopZHaK&02EA+TM}pj>sx$QU<|Z0a0_lAlH%^^GwfgH&J}(BH z-)nm99~D1Ho5Ox@_%f0_bQG2W%4X9+a_Cz&o5pv;@}cpM`u^Ye>HxzilNgDi-FDEB z68O20LqkfS-FC1VNupAD5G04bRVoi~cQ}f6+ri!8D6FpQeQrnz7)IH5C-~}sdffs5 z96x^@R@X(dxdW@~;`sUN`26Lr_j{PcNDKf_Nh#h109Mxx)SmA(;KLV>F>&sF;GBu6 zLL8}W2Ppu5exD1JfFJd`1#REP^XC#iZMGmrVz9a{Dgb8x?%+n)1CYt&X&E3Pigf1L zQ|}U@NS8))l*!~neG6nVd6H%2&=|6;gdX1uWEf=@xvj#}0Hp zK+|+eZ`?x;9k_XcB}t*jh@w%N!utA3sCxv1j_vz=fTrnmc6|la@iCaCS!AIduT&sDTq_V6~Z(~x^ zbXt-W5~4WpM1&~PlBAHP>D1dKmE~8lmH}E^tC3-p$!{n4dSrTqO-y_O0Ql(6O_-%w z#J{?R(y+YMTf1x@)hGWO#fse)=G_WL9b;cVB zMM(_&|A40H)N0w@=Rp+D7-Nhv#u#IaF~%5U|2zKx$smasSJGGd00000NkvXXu0mjf DOt{%f literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/off-inhand-left.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/off-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c14f709fe95f94b44f899b08e7d64153735eea43 GIT binary patch literal 1016 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/on-inhand-right.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/on-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..105dfe1d722337780001c22ecfd7820f0fe80132 GIT binary patch literal 1559 zcmV+y2I%>TP)VLLewHIXO5f001bFV_;x1aCC8UWfEXu$jvJ$3UYT+h=`0*U_Z~m#=y(~28qeV z1&#p$J|K2peqJgA2KaW3fe}Ps)&-e`DUTO$B^MNx0O>zKY?P8(oXo($XaHnqmzNX( z#Tn-S*&<2VVD<(OyC@{c8OS~YWb>s%*jGU8BnbNnh+PEq1d#m&q&^+YX5s*w17XX6 z*d?hIAbS~{^9w4AGSf3k6bvmbEfpM7@{>{(f-8$lQge$HJoA$Ciwg3K5=&B3fNCM` z0|P;bLQsfl05w`@lIU-O02B`p*5^QQ_%e!}L5Lwha%oW+l*!0sOqh=_V~zv^ga1+n z29`evF_T^fh6Oqd4E$3OVrqsA38eLVK2GMSXLPrOC=+@$1y7@9Jed#DT*ap6oJy}N?1GloVx5-|V zmHl}d^r3}5t{XDggBw`TYOPx1pENOlG@3*cbMGE*u4XZg=w_SR^Mk{^_uO+Y=ll51 zIp6ud0|J3SAP@)y0)apv5C{Z<=L^ZW8H`4ZXQR$kpuL*CYJk?|bRB5to&*wX32)9R z7N87W2@<-%Dv$;?fs9c~Q3-8rr?l56Cs;(LmK48xTNoP~mI}4CWUmss;AMaeCu$gV0Z&MFkUo&Jssen82#GpwUzXm9V-5{U%KWSkLAVo6IgqDdr^aT19H z?d_dAl#@Ho&47Hn`>J0xn~o z{U7ghG3Eecl0!0?aJoE<-TIU_uYJL}Iv3M(5$=B0gVW_fT{nh*>5czzcnJWXZvt$J zUTIOlH-X*m+IpW$?hwcTnP?=8EGsx1RSaFf2EfquYd9QL$g)B-65eWikizVTKwwsi z$0G&b#p4kIf!SRrLBj$zuiUxmU7VZ3U0s7scJOdEj7@gnuC8HmZi*{+ZhFy|!jiK9 zfVH*Ng2QsR`g}jY22=u-U%%5aT2bYu*?XLalcU6zgM57Z)^T7ZTauKhAFvnlJ;5@d z99`4XSIroYTg?73Ad+~<<(_IC;sHY%sm!@b0l9qNn3D{ z8<#)04^*HhR^(#;|1`fZk zQ_E1_;AMV(n$1*-t{(^6(6h&@z*?8nmD>HUPoJVKAiJI$&Q1b|Ub^vZT_(AKZ*m-U zBaK5T2UtV*1q@3lY4&x<=`f|yi&_Q?aA?x#`#$C-(&&eTzX6}>zq*Qqo)-WB002ov JPDHLkV1k$dy6^x1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..a7bfa2708bfd8e1ff234aeb65e2ca128e364d552 GIT binary patch literal 2588 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/meta.json b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/meta.json new file mode 100644 index 00000000000000..f8036af7bfce25 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:IAmRasputin#5242, reptilian made by kuro(388673708753027083)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..e6a61b49c0da0718c7c2a7aedf3de2c70cf3105f GIT binary patch literal 2643 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/meta.json b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/meta.json new file mode 100644 index 00000000000000..e488c2486108d0 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:IAmRasputin#5242", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 0641bebded7d4e255525c239949720c0566f7a3c Mon Sep 17 00:00:00 2001 From: EstKemran Date: Wed, 18 Sep 2024 13:51:57 +0300 Subject: [PATCH 02/47] chainsword --- .../Entities/Objects/Weapons/Melee/sword.yml | 47 +++++++++++++ .../Weapons/Melee/chainsword.rsi/icon.png | Bin 0 -> 947 bytes .../Melee/chainsword.rsi/inhand-left.png | Bin 0 -> 752 bytes .../Melee/chainsword.rsi/inhand-right.png | Bin 0 -> 759 bytes .../Weapons/Melee/chainsword.rsi/meta.json | 64 ++++++++++++++++++ 5 files changed, 111 insertions(+) create mode 100644 Resources/Textures/SS220/Objects/Weapons/Melee/chainsword.rsi/icon.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Melee/chainsword.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Melee/chainsword.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Melee/chainsword.rsi/meta.json diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml index dbb923f0e12aed..305837626b76e8 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml @@ -106,3 +106,50 @@ - type: Tag tags: - OfficerCutlass + +# Цепная меч-пила +- type: entity + parent: BaseItem + id: Chainsword #todo Хуйня, переделать. + name: цепной меч + description: Технологии и ультранасилие в одном флаконе! + suffix: Death Squad, Эскадрон Смерти + components: + - type: EmitSoundOnLand + sound: + path: /Audio/SS220/Effects/Drop/chainsaw.ogg ##new sound_drop effect, add MIXnikita + params: + volume: 2 + - type: Sharp + - type: Sprite + sprite: SS220/Objects/Weapons/Melee/chainsword.rsi + state: icon + - type: MeleeWeapon + autoAttack: true + angle: 0 + wideAnimationRotation: -135 + attackRate: 4 + damage: + types: + Slash: 30 + Blunt: 20 + Structural: 170 + soundHit: + path: /Audio/Weapons/chainsaw.ogg + params: + volume: -3 + - type: Item + size: Small + sprite: SS220/Objects/Weapons/Melee/chainsword.rsi + - type: Appearance + - type: DisarmMalus + malus: 0 + - type: Reflect + enabled: false + #todo + # - type: Clothing + # sprite: SS220/Objects/Weapons/Melee/chainsword.rsi + # quickEquip: false + # slots: + # - Back + # - suitStorage diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/chainsword.rsi/icon.png b/Resources/Textures/SS220/Objects/Weapons/Melee/chainsword.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9c056be91770ac4c6664a458ad2a79f692989a50 GIT binary patch literal 947 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/chainsword.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Melee/chainsword.rsi/meta.json new file mode 100644 index 00000000000000..df5a68564ea94c --- /dev/null +++ b/Resources/Textures/SS220/Objects/Weapons/Melee/chainsword.rsi/meta.json @@ -0,0 +1,64 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/weapons/sword.dmi, inhand-left & inhand-right sprited by Estkemran (Github) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + } + ] +} From 33c93b9f23e1794a42664972df4991a52c829977 Mon Sep 17 00:00:00 2001 From: EstKemran Date: Wed, 18 Sep 2024 15:25:23 +0300 Subject: [PATCH 03/47] pulserufle --- .../Weapons/Guns/Battery/battery_guns.yml | 17 +++++++++++++++++ .../Weapons/Guns/Projectiles/projectiles.yml | 16 ++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml new file mode 100644 index 00000000000000..ea37fd4bfac652 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -0,0 +1,17 @@ +# Новые прототипы пишите выше +# Death Squad +- type: entity + name: пульсовая винтовака + parent: WeaponPulseRifle + id: WeaponPulseRifle2 + description: Энергетическая винтовка тяжелого типа, способна разрушать структуры. + suffix: Винтовка, Death Squad, Эскадрон Смерти + components: + - type: Gun + fireRate: 2.5 + - type: HitscanBatteryAmmoProvider + proto: Pulse2 + fireCost: 100 + - type: Battery + maxCharge: 40000 + startingCharge: 40000 diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 5db2014ad379d7..14837b99a011e1 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -157,3 +157,19 @@ radius: 3.5 color: blue energy: 0.5 + +- type: hitscan + id: Pulse2 + damage: + types: + Heat: 35 + Structural: 400 + muzzleFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle_blue + travelFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: beam_blue + impactFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact_blue From bc5f9c83759f3dec46edebda6d376a2375b4fa63 Mon Sep 17 00:00:00 2001 From: EstKemran Date: Wed, 18 Sep 2024 15:57:50 +0300 Subject: [PATCH 04/47] holyshit --- .../Objects/Specific/Medical/hypospray.yml | 29 ++++++++++++++++++ .../Prototypes/SS220/Flavors/flavors.yml | 7 ++++- .../Prototypes/SS220/Reagents/medicine.yml | 19 ++++++++++++ .../Specific/Medical/medipen.rsi/holypen.png | Bin 0 -> 317 bytes .../Medical/medipen.rsi/holypen_empty.png | Bin 0 -> 388 bytes .../medipen.rsi/medipen-inhand-left.png | Bin 0 -> 341 bytes .../medipen.rsi/medipen-inhand-right.png | Bin 0 -> 326 bytes .../Specific/Medical/medipen.rsi/meta.json | 23 ++++++++++++++ 8 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/SS220/Entities/Objects/Specific/Medical/hypospray.yml create mode 100644 Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi/holypen.png create mode 100644 Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi/holypen_empty.png create mode 100644 Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi/medipen-inhand-left.png create mode 100644 Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi/medipen-inhand-right.png create mode 100644 Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi/meta.json diff --git a/Resources/Prototypes/SS220/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/SS220/Entities/Objects/Specific/Medical/hypospray.yml new file mode 100644 index 00000000000000..18b937e4bd526f --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Objects/Specific/Medical/hypospray.yml @@ -0,0 +1,29 @@ +- type: entity + parent: ChemicalMedipen + id: EmergencyMedipenDQ + name: божественный медипен + description: Экстренный медипен, который в кратчайшие сроки ставит на ноги даже при самых тяжелых травмах. Из-за дороговизны и трудности производства применяется элитными отрядами. + suffix: Shitspawn, Death Squad, Эскадрон Смерти + components: + - type: SolutionContainerManager + solutions: + pen: + maxVol: 20 + reagents: + - ReagentId: HolyMolyWater + Quantity: 20 + - type: SolutionContainerVisuals + maxFillLevels: 1 + changeColor: false + emptySpriteName: holypen_empty + - type: Hypospray + solutionName: pen + transferAmount: 95 + - type: Sprite + sprite: SS220/Objects/Specific/Medical/medipen.rsi + netsync: false + layers: + - state: holypen + map: [ "enum.SolutionContainerLayers.Fill" ] + - type: Tag + tags: [] diff --git a/Resources/Prototypes/SS220/Flavors/flavors.yml b/Resources/Prototypes/SS220/Flavors/flavors.yml index 34995c6757be16..3124dda068adae 100644 --- a/Resources/Prototypes/SS220/Flavors/flavors.yml +++ b/Resources/Prototypes/SS220/Flavors/flavors.yml @@ -41,4 +41,9 @@ - type: flavor id: french75 flavorType: Complex - description: терпко-сладко \ No newline at end of file + description: терпко-сладко + +- type: flavor + id: HolyMoly + flavorType: Base + description: божественно diff --git a/Resources/Prototypes/SS220/Reagents/medicine.yml b/Resources/Prototypes/SS220/Reagents/medicine.yml index 28f6b12a2cf8bf..a21ea3ecb5bf6c 100644 --- a/Resources/Prototypes/SS220/Reagents/medicine.yml +++ b/Resources/Prototypes/SS220/Reagents/medicine.yml @@ -159,3 +159,22 @@ damage: types: Poison: 0.5 + +- type: reagent + id: HolyMolyWater + name: эссенция святой воды + group: Medicine + desc: Концентрированная святая вода, лечащая все болезни и даже смерть. + physicalDesc: невозможное + flavor: HolyMoly + color: "#e8e8e8" + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + groups: + Brute: -10 + Burn: -10 + Airloss: -10 + Toxin: -10 diff --git a/Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi/holypen.png b/Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi/holypen.png new file mode 100644 index 0000000000000000000000000000000000000000..471d68d69e53104f52756da1e14e24d17cc2f168 GIT binary patch literal 317 zcmV-D0mA-?P)Px#_en%SR9J=Wl0iztKoo|*f{12O3PD|@3$swL6?Yy$@HAdRJ%xAh65c_Y3c84k zjKxB`(BzHLN?fSXF%xj-!uM?+?|*Oj{}~1pMNt&xztd?O#PLq`Qxg$_AYhP9Yi-}c0F31ykHy)|UtOltihis>GnV3T`RhZ|0PnVexRE{P8I$V|%U zc(d9)y>&u(1BeKjNxiq2&8L{^)#+#FNAFF7Tfgmy2)+mR1}Mv%FkEYd0Px$K1oDDR9J=Wl+8-RKoo^fMMSgEV4z(jptDd&bg5fkAP*%zR9-;nLUCtFmvPZV z7?@CNGGnDOZp_$_pGGvenQxWMy}9SiotptP8jVKt&kULZo_8UO=P-O|%=;}{Z9(gB z2xHGEnfYs4cSeXS9h*Ri3|#PDI3(_EoRD zfprrAuv}(1JvqZ={H)>&n_&N-zA=jziQ9OJE8E2^jxf1CmghH5rR0hM-}f8OdpxFK zDMc(l)EY}ESlYe`mQrxeQFr1M13?f}vIudNDIszs*unbyCWOe5=P3ZI65BXb#UMUT z?yy?D0|30Y@6W>B?mtMDz5Z+l3UQXwQi1zY)z130G~NTIX({m}i7=nDUM{1?qNZu7 i-u5M~(P%Up0Qdxdmwd?qMUe;q0000=(s|3@7Gnun!gLy#4q8G8r-buKZz%=cf;*5>V%Z}~&u4}-^ e?H~h2bIkYjsSA3!{;mav6N9I#pUXO@geCwh5`?n= literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi/medipen-inhand-right.png b/Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi/medipen-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..9b62a31f1f8ab172e2fcfb5e5f125d7b535e1512 GIT binary patch literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1FMR zi(^Q|oVT|e`I-zwTrYY*>bvt_C?~cMM{)CaTuA2MQOYMj#qF=_^5<$5m3;CBUp~J2D<)z1 k;=m8wv{=|6iv7@^CXLBb_U>GoXy85}Sb4q9e07U71D*ylh literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi/meta.json b/Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi/meta.json new file mode 100644 index 00000000000000..994e6c814aab52 --- /dev/null +++ b/Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "tgstation at 986af32e22a88dae14fd147d812a5a4d27c1bc30 | stimpen sprites made by PuroSlavKing (Github) for Space Station 14. Nearly all resprited by joshepvodka. holypen sprited by Estkemran (Github) dor SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "holypen" + }, + { + "name": "holypen_empty" + }, + { + "name": "medipen-inhand-left" + }, + { + "name": "medipen-inhand-right" + } + ] +} From c43f7c8b93ed10eb19688e052b837c6ae030d7c6 Mon Sep 17 00:00:00 2001 From: EstKemran Date: Wed, 18 Sep 2024 16:07:51 +0300 Subject: [PATCH 05/47] omni-hud --- Resources/Locale/ru-RU/ss220/clothing/Eyes/hud.ftl | 2 +- Resources/Prototypes/SS220/Entities/Clothing/Eyes/hud.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/ss220/clothing/Eyes/hud.ftl b/Resources/Locale/ru-RU/ss220/clothing/Eyes/hud.ftl index 27253af446639e..214de95652e85c 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/Eyes/hud.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/Eyes/hud.ftl @@ -1,3 +1,3 @@ ent-ClothingEyesHudOmniversal = омни визор .desc = Секретная разработка для очень секретных личностей. - .suffix = Сек-мед-хим + .suffix = Shitspawn, Сек-мед-хим-термал diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/SS220/Entities/Clothing/Eyes/hud.yml index 6e01a32f8b539c..5bc4330de7c09b 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Eyes/hud.yml @@ -27,8 +27,9 @@ id: ClothingEyesHudOmniversal name: omniversal hud description: A secret development for very secretive individuals. - suffix: Sec-med-chem + suffix: Shitspawn, Sec-med-chem-termal components: + - type: ThermalVisionClothing - type: Sprite sprite: SS220/Clothing/Eyes/omni_hud.rsi - type: Clothing From 6c848e23696078d4925c27fe53d6272e5efc4374 Mon Sep 17 00:00:00 2001 From: EstKemran Date: Wed, 18 Sep 2024 16:31:26 +0300 Subject: [PATCH 06/47] magboots --- .../SS220/Entities/Clothing/Shoes/boots.yml | 29 +++++++++++++ .../Boots/dq_magboots.rsi/equipped-FEET.png | Bin 0 -> 642 bytes .../Shoes/Boots/dq_magboots.rsi/icon-on.png | Bin 0 -> 406 bytes .../Shoes/Boots/dq_magboots.rsi/icon.png | Bin 0 -> 411 bytes .../Boots/dq_magboots.rsi/inhand-left.png | Bin 0 -> 345 bytes .../Boots/dq_magboots.rsi/inhand-right.png | Bin 0 -> 357 bytes .../Shoes/Boots/dq_magboots.rsi/meta.json | 41 ++++++++++++++++++ .../dq_magboots.rsi/on-equipped-FEET.png | Bin 0 -> 665 bytes .../Boots/dq_magboots.rsi/on-inhand-left.png | Bin 0 -> 343 bytes .../Boots/dq_magboots.rsi/on-inhand-right.png | Bin 0 -> 356 bytes 10 files changed, 70 insertions(+) create mode 100644 Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/equipped-FEET.png create mode 100644 Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/icon-on.png create mode 100644 Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/meta.json create mode 100644 Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/on-equipped-FEET.png create mode 100644 Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/on-inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/on-inhand-right.png diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml index 448633054b6e7f..3c3b21259fde03 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml @@ -62,3 +62,32 @@ sprite: SS220/Clothing/Shoes/Boots/bardboots.rsi - type: Clothing sprite: SS220/Clothing/Shoes/Boots/bardboots.rsi + +- type: entity + parent: [ClothingShoesBootsMagBase, BaseJetpack] + id: ClothingShoesBootsMagDQ + name: магнитные ботинки Эскадрона Смерти + description: Самые современные магнитные ботинки в узнаваемых цветах. + components: + - type: Sprite + sprite: SS220/Clothing/Shoes/Boots/dq_magboots.rsi + state: icon + - type: Clothing + sprite: SS220/Clothing/Shoes/Boots/dq_magboots.rsi + - type: Magboots + toggleAction: ActionToggleMagbootsAdvanced + - type: ClothingSpeedModifier + walkModifier: 1 + sprintModifier: 1 + enabled: false + - type: GasTank + outputPressure: 42.6 + air: + volume: 5 + temperature: 293.15 + moles: + - 1.153853429 # oxygen + - 1.153853429 # nitrogen + - type: Item + sprite: null + size: Normal diff --git a/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/equipped-FEET.png b/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..bbf64522b70e662a8ab0ec98af552316a7217021 GIT binary patch literal 642 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>V6yRaaSW-L z^Y)fu_H73Vwg=&*?KM%8*gBIoOmLZy%X?B_Q|j4kiuH$z>zwL*|2eefofA3{wy9;2 z3S08>79oz4NiTWSV%U|FcCUIJoU30e|KY*z$NL_CuG}TApo9Rw{3F!5_lMZM)N1?D z$!oKh_apBqtA-cnr}92|9DhHq_nXPZRUK>_uKbes6)S(OxNkL&yZx_otxGKi1aS<-Iz*h`V{g%IvMO9XBlQmo0mCZaa{*;%b=y%UPl0KXzN( zyPkXgc;uFFi+ZuQ3*Y|icwD>q7q|I>>$|s_$&32EmFRoC=zZVp3+1vFeci#<$DS>A zT3^0<(td|YG0~Ni*T4E0@^^Jr&!6L-ld>28ax+hO{f{-EDhff|>-S$o| ztc{9YC(?lxDWy|X-DTbKqmz5Ur zf7s{dGOdc?`d6UXuF%T+_1pG!ya-FRnRi|g30!Om;-C5Y49l6|Dd7fplOG$_7_8H=M9Zh+B39jnbnLL zy;8IHvN~S4;+6U%IPRd!O13j;OfGM(?l~=fVl$IcSz=tGZkjRU{o>Bw_#n literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/icon-on.png b/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/icon-on.png new file mode 100644 index 0000000000000000000000000000000000000000..4791c647ab4014a8fc7cd72a32dacf90d9790568 GIT binary patch literal 406 zcmV;H0crk;P)Px$P)S5VR9J=WltD_vKp2HTjY!j32@`?~Nj8O+;?A8rw}Pkh0N%hG^aR~WDOeOk z3lfrLr&9!pi<;C1XF9s=yw&{k!n`;CpEuy);c@6Va{cf&IIGTCH}yLm^3P2j2OUh@ z7;V*XGLWYIs@J=0>c!#(tyjpmj519yaR6B)DT=vK=fuT8eehqoGEG?Kne|*}19$gB z03OE>JWLt^8>f`od#>{c!mzuur}YY@6ha709AIrfICh|YlQ8Tydp1tW2%xf=ICe3R z6y=VP)~iOq#<^hc2(AdLIOqU0(aIu;lo4V&#l+QS@;pOpa}=#3NYj3$!Y;4h_4V^~ zvnWbRAz&~tbB-`NYiEBpdjeoM&zW4rn7FzVbwZR<|9=O5%lGJXO>E(AKDMtQz;apI zBPx$RY^oaR9J=Wl)*~FKp2F-N~DI3AKDugj$%410Ov)k(hl zqnqomVlpN6edu=eoF%l*%GnPx$6G=otRCt{2+C54GK>&u~S52YBN*01e$Y7PUA|62Oy^`1Q0A9kvP9iq0qzHjU z8^_p$wOTpXviik|arzq<>~B*Tj>_aSc#aGm2sez|q4a*Q=LS zYi^ovYdhs+jjOZM`tq>Ha`{G447r%z0&q7R{7HTtSx!I*pWn*z{>L>p z&99@Eax#Du_UgfG!D96e!1)f$pI=+=-lq9=CA|V6jO!|l0I0%JMb;2jrHrKhVh&kg`9JydRKT r>i$5du0W3dK&O5H*dLH2NlNAe?`o&%76+SS00000NkvXXu0mjfuH2ns literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..96e6191883f128e7ed10c0b9d1ed4b814c85bab7 GIT binary patch literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z-Ln`LH zy|v$q*^uG*$N9G$E!8?D;=t zrRBQ?7vHCIwH)X_t?FGT1T>g|;eh?-&3Q={HoTLb-0?W}WYUt!&&BVayLWxvO||`J z_eXF4@$8XJjQn?#xpk*z#Dw>MpR}ZX&;8t2(~dk@f7dsgeW6tK`>Cln&&NdC<^Giy zn7n`co*zE!3+-oR82z5468p~c@%H|dGJCWChXgm23Cz(|@jNG1wCzF!P%?O5+05Od zzMt0LVZ2v;S5{W9XZ8A*d*7>6%nmxw4|W@nXjo@b_tJN-eZb1M>^YOF>J#D?-}TyS zZ;-!KeuL+$zm2JZ?h0T3Im~@w-SE8}sNDXM^h>_wFZCmWAA*eVboFyt=akR{02@%B AA^-pY literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/meta.json b/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/meta.json new file mode 100644 index 00000000000000..83e862c89c1a5d --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8. equipped-FEET-vox & on-equipped-FEET-vox state taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/31d6576ba8102135d058ef49c3cb6ecbe8db8a79/icons/mob/species/vox/shoes.dmi, and equipped-FEET-vox state modified to fix inconsistencies, color edited by Estkemran (Github) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "on-equipped-FEET", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "icon-on" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/on-equipped-FEET.png b/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/on-equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..b6a846b2f03253a5733fd0a77ce066b2fc5161a1 GIT binary patch literal 665 zcmV;K0%rY*P)Px%Q%OWYRCt{2+COjFKo|z_$E5==OhrCbNLUy}{8N++QMRfZTcxn}1Mn&OIWlL; z*oC2+hc4NwELBC+NC?7EML}f2moyWR#@{uYC)#t$xU3$>&R9YE6VcPOo>J&Jl3khJO3uBQ6Ry^7;JQ zToBA~@%}T~lQDj}4V}g&xNbwg`QC#U%$7$j;`a6{TB9KX!~R>n0j}H7)#?#Er;PSw z4Bz)LosIzj)9LbidoqUSlu@l7?fe*o{VUc2zV9OlW^4U}UYvGwh6RG10q*D6U%{Ihg7a@G#oXe?T-7Ad*Yx zUOq;c6%fhA<`woLnh99Fqffi{YCa$?uVCsI9pw^5?7944uFPEvU}|K=&vj}dBK|bo1WJz|CAO; ze)8+ZgVQ^1pOr}dwg==SF#57L=WoNEps(zkzAzVg-;}>`LU_U^`w4sGCq%#ccfc*S nQRZ)B?=QxLdZ0HnXYxP#xW*<%;><5#NHKW2`njxgN@xNAm-Cp` literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/on-inhand-right.png b/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/on-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..8ff71c6a72a2166a851279be3e95825a8a9d4c2d GIT binary patch literal 356 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zwB_RlVc7vRPf$OYue08t=}_p8sQ3 zTE1Iw@qId1%YpvWs@`=%Kyw)w4%lzro|$B@gJaT@I}yj8Oj`2!Vt3o;@4eY&C-XnQ zzplGaa$ei(-RWo3<{PP9f4p|GitUrVdBNLN)au{nMcwAVdZT*1&gr^mr#@vq|KBj< zPy6a_{Zg5#$19h8*7v-0wb7*Vw@2Fd+UU)s8e(%a}=Bc;p4w$X{&MszpYb}u5 zeeDD Date: Wed, 18 Sep 2024 17:17:13 +0300 Subject: [PATCH 07/47] sp-91 --- .../Guns/Ammunition/Magazines/magnum.yml | 18 ++++++++ .../Objects/Weapons/Guns/SMGs/smgs.yml | 42 ++++++++++++++++++ Resources/Prototypes/SS220/tags.yml | 4 ++ .../Magazine/Magnum/sp-91.rsi/base.png | Bin 0 -> 257 bytes .../Magazine/Magnum/sp-91.rsi/mag-1.png | Bin 0 -> 138 bytes .../Magazine/Magnum/sp-91.rsi/mag-2.png | Bin 0 -> 138 bytes .../Magazine/Magnum/sp-91.rsi/meta.json | 20 +++++++++ .../Objects/Weapons/Guns/sp-91.rsi/base.png | Bin 0 -> 681 bytes .../Weapons/Guns/sp-91.rsi/bolt-open.png | Bin 0 -> 681 bytes .../Guns/sp-91.rsi/equipped-BACKPACK.png | Bin 0 -> 1521 bytes .../Objects/Weapons/Guns/sp-91.rsi/icon.png | Bin 0 -> 820 bytes .../Weapons/Guns/sp-91.rsi/inhand-left.png | Bin 0 -> 437 bytes .../Weapons/Guns/sp-91.rsi/inhand-right.png | Bin 0 -> 422 bytes .../Objects/Weapons/Guns/sp-91.rsi/mag-0.png | Bin 0 -> 265 bytes .../Objects/Weapons/Guns/sp-91.rsi/meta.json | 35 +++++++++++++++ 15 files changed, 119 insertions(+) create mode 100644 Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml create mode 100644 Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/SMGs/smgs.yml create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi/base.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi/mag-1.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi/mag-2.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi/meta.json create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/base.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/bolt-open.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/icon.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/mag-0.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/meta.json diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml new file mode 100644 index 00000000000000..99d966949a4c5b --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml @@ -0,0 +1,18 @@ +- type: entity + id: MagazineMagnumSubMachineGunSP-91-RC + name: "SP-91-RC magazine (.45 magnum)" + parent: BaseMagazineMagnumSubMachineGun + components: + - type: Tag + tags: + - MagazineMagnumSubMachineGunSP-91-RC + - type: BallisticAmmoProvider + proto: CartridgeMagnum + capacity: 110 + - type: Sprite + sprite: SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-2 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/SMGs/smgs.yml new file mode 100644 index 00000000000000..5e48277f3e1abf --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -0,0 +1,42 @@ +- type: entity + parent: BaseWeaponSubMachineGun + id: WeaponRifleSP + name: SP-91-RC + description: Крупный пистолет-пулемет использующий патроны калибра .45 магнум. + suffix: Shitspawn, Death Squad, Эскадрон Смерти + components: + - type: Sprite + sprite: SS220/Objects/Weapons/Guns/sp-91.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Gun + fireRate: 7 + - type: ChamberMagazineAmmoProvider + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineMagnumSubMachineGunSP-91-RC + priority: 2 + whitelist: + tags: + - MagazineMagnumSubMachineGunSP-91-RC + gun_chamber: + name: Chamber + startingItem: CartridgeMagnum + priority: 1 + whitelist: + tags: + - CartridgeMagnum + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance diff --git a/Resources/Prototypes/SS220/tags.yml b/Resources/Prototypes/SS220/tags.yml index 00821a55cd8d08..f1a359e936f7aa 100644 --- a/Resources/Prototypes/SS220/tags.yml +++ b/Resources/Prototypes/SS220/tags.yml @@ -107,3 +107,7 @@ # EscapePod - type: Tag id: EscapePod + +# SP-91-RC +- type: Tag + id: MagazineMagnumSubMachineGunSP-91-RC diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi/base.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..070e38fcddf018186391176cd10b01fe2b324e2c GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}yFFbTLn2z= zPT9zH*nr1He`!XbSaQMar4RIV|2EbwF1^o)eC2_{C>noYbSBK5{*VFBZBM!5A16#(q~T?3CoN#VX|u-@aiBLCJYD@<);T3K F0RTplU|#?L literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi/mag-1.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..e59b58c967dd113b33e36d2c8152868b2f0a2106 GIT binary patch literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|_yc@GT!HkJ z_2%Es`CshvUy|*qD8yP4)-O3|#*h*nH0GX#&+Sc)I$ztaD0e0sxDLCv^Y- literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi/mag-2.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..e59b58c967dd113b33e36d2c8152868b2f0a2106 GIT binary patch literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|_yc@GT!HkJ z_2%Es`CshvUy|*qD8yP4)-O3|#*h*nH0GX#&+Sc)I$ztaD0e0sxDLCv^Y- literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi/meta.json new file mode 100644 index 00000000000000..a41ae941873c9e --- /dev/null +++ b/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + } + ] +} diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/base.png b/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..85f7346c6502afb085df05bf9ce1108c77611389 GIT binary patch literal 681 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 y1TF0000k44ofy`glX(f`CP*w@YwyDjEofZg z$b7A3p@72C&CCmAISZ7nq-V^##XE^>vy7}y{p*ZV)0mg@C`{`UTi|(>Z#J_;*}_Qw zb>S*DG6|hN^KS`nSan0~MshHp2&0u<-wo#pmQUDxv~7QD%$voacHgQuOriF^*u?Ie z{%aYFi`(UxFVFeQ_J4h1bL8ftnylzCmo-kvnTFSmgHXU3tco{dlvvwm@>; zN|gee9rKj>BzcQ(-QFX^(kOZA8q0LvoGFiAxw55gV3g?EAzZQH;=w@q;CXXOyL?&X z-jr-u6@JFS_y2+BxqRDJOB!EUdx}lymk)b8n^Brc;UPcv?9!xTue1O07{?X;RZqLa ZxU`=$ac<6OZ(wLLc)I$ztaD0e0suFRtr!3R literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/inhand-right.png b/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..2e5045a35dd2191aa8e2c36450c7dece0465e749 GIT binary patch literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`CWwPm$ef#%70 zx;TbJw7#9z$aPqO$EEdx@yGx672?*rZl2B5Xy)Bx_`<6An8vfETefWZlI^rJBjD4~ zpT7D>53@}CsIQ;mtin7;W`b$-l8$Ru4lHG6e>J8)f2gC-bKil9t+vPg;qey=m)VZW z&N%!o@W&aghy-~{`BM{_AMb4KxWaH#_`0oA%gG(i4^-0Hy7c$_3o@S>Uw^hi`uLQq zedY_3XS_Ogd|6F$fo5H1X6DP=QcA}X7}no(Z2ogbq0V>n%`f_=6`K{VPP=(JvB`1I zW6$e}ClpSx8Z@qbY>*=0&h~!C&eZnff1KGK&cE@>=*v{oWfCk~19YurJ{t2p3Ji-X z+mSuZ@s(#)TKn#jd5#kIHymEa&|L9nrfkpz$Er65XBFy?^O@&uqh KelF{r5}E+Q1GKIH literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/mag-0.png b/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..c5160807f5bcb16f00d241a9e1a52bf6a79c1814 GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}hdo^!Ln2z= zPT9zH$Uva&e@6j#ogy0V=pKWo3F^S%6a(&OFvy#SC1ghL$woBAHMtd z`>?Eo0E?r5OKODYh9Iqd_jnIam{J@Yv?uqrzrUgD5v}k89aDrD1e{KE>5CbNi903K z-?=KN(Bi@j>W=W&&_`t!&mt17S8-v58Et|?-Y`rdly(~;qBzCiCV Nc)I$ztaD0e0stgXX7d05 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/meta.json new file mode 100644 index 00000000000000..12a95021c631aa --- /dev/null +++ b/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} From 45b812e4c0a4341b4162296a3cff975a535b11d9 Mon Sep 17 00:00:00 2001 From: EstKemran Date: Wed, 18 Sep 2024 23:36:40 +0300 Subject: [PATCH 08/47] buff-pulserifles --- .../Weapons/Guns/Battery/battery_guns.yml | 13 +++++++++-- .../Weapons/Guns/Projectiles/projectiles.yml | 22 ++++++++++++++++--- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index ea37fd4bfac652..e02e2eba8c39ea 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -13,5 +13,14 @@ proto: Pulse2 fireCost: 100 - type: Battery - maxCharge: 40000 - startingCharge: 40000 + maxCharge: 400 + startingCharge: 400 + - type: BatteryWeaponFireModes + fireModes: + - proto: Pulsekill + name: режия для убийства + fireCost: 1 + - proto: PulseDESTROY + name: режим для УНИЧТОЖЕНИЯ + fireCost: 5 + soundGunshot: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 14837b99a011e1..7dab82b2d28217 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -159,11 +159,27 @@ energy: 0.5 - type: hitscan - id: Pulse2 + id: Pulsekill damage: types: - Heat: 35 - Structural: 400 + Heat: 20 + Structural: 200 + muzzleFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle_blue + travelFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: beam_blue + impactFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact_blue + +- type: hitscan + id: PulseDESTROY + damage: + types: + Heat: 50 + Structural: 600 muzzleFlash: sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi state: muzzle_blue From faa91ffe2ac89e5b204f09de867ce2ccee9e290f Mon Sep 17 00:00:00 2001 From: EstKemran Date: Thu, 19 Sep 2024 00:07:06 +0300 Subject: [PATCH 09/47] gloves-dq --- .../SS220/Entities/Clothing/Hand/hands.yml | 21 ++++++++++++++ .../Gloves/dq_gloves.rsi/equipped-HAND.png | Bin 0 -> 367 bytes .../Hands/Gloves/dq_gloves.rsi/icon.png | Bin 0 -> 640 bytes .../Gloves/dq_gloves.rsi/inhand-left.png | Bin 0 -> 207 bytes .../Gloves/dq_gloves.rsi/inhand-right.png | Bin 0 -> 211 bytes .../Hands/Gloves/dq_gloves.rsi/meta.json | 26 ++++++++++++++++++ 6 files changed, 47 insertions(+) create mode 100644 Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi/equipped-HAND.png create mode 100644 Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi/meta.json diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Hand/hands.yml b/Resources/Prototypes/SS220/Entities/Clothing/Hand/hands.yml index b12a5de0cdccc4..f426934638b46f 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Hand/hands.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Hand/hands.yml @@ -67,3 +67,24 @@ sprite: SS220/Clothing/Hands/ysatyu.rsi - type: Fiber fiberColor: fibers-red + +- type: entity + parent: ClothingHandsBase + id: ClothingHandsGlovesDQ + name: боевые перчатки ЭС + description: Силовые перчатки, многократно усиливающие механическую силу удара. + components: + - type: Insulated + - type: Sprite + sprite: SS220/Clothing/Hands/Gloves/dq_gloves.rsi + - type: Clothing + sprite: SS220/Clothing/Hands/Gloves/dq_gloves.rsi + - type: MeleeWeapon + attackRate: 1.5 + damage: + types: + Blunt: 45 + animation: WeaponArcFist + - type: Fiber + fiberMaterial: fibers-insulative + - type: FingerprintMask diff --git a/Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi/equipped-HAND.png b/Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..fa917d3ca78179420355328ef3ffd8fa0ca8678e GIT binary patch literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zH9cJ%Ln`LH zy>-#A*+Asj$NkGReRa9h{9ja8ysZAwaxB%ksb$G-2QgzwR&~x--*+!vet+T9cMM8U z@M-^@9$Owo7lvdbhO*t$FMefk-Pp^J`{O9s7bzsRc5z_ElDYGxN;8hg?m(l-nk- z=)2|bzuE?GuO0g|clY5aYwP`)Qm=l!UG?X3+u!9oQqD$wc6C7lPx5EjTH4B6&GXN3 z=J+_Po+;?2b7k`1C3otU3nm-wIq(0UvF6(OXVVR~Z2xX~@43We-fy2D@0z){+jXO? zjHABgw0%>;MQ-2tzBT0A^b4kE?_a;x-vI=F*xdU93%T?5{(21zK?YA(KbLh*2~7aM CouwE6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi/icon.png b/Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8f9ff237a27adc4be1ba8812d0d6b14a73873ed7 GIT binary patch literal 640 zcmV-`0)PF9P)Px%I!Q!9R9J=WltD}5KorM+wKbhXj27I9iFy^JQ1Bb<$qylVFR};EJ$WkhAnbP# z{1E#wJbP6RQzLVAC<^E@RRg= zJP9_=+xQ3(@4!!l5CAyNEx4UXEBUm)pKO2qhLkRjvx}52Qo4lU z6sOGHyB8w!`w~9CdwHsPw&HmRau}eS3+NE^(}| zZHHRBU239Wpi{S!TDy&HJH)X0^4%c46#sfeRyD`&zO=+v#`sM#{ZD8IBlFg4)h-Wa6#kwYi*`{ z(H$VAYp$c!zcPDwh9e$VuV%8-=Xv-P;LQ}?WSSFJD&kD7h?mRUIb+~)^;(OUOU~4) z&;@TY#hWP(p8^1;7rjF37u^8>qaQPq>olC3D>x13h3etme;~bvm$#Vt$q7nDoQ89g zG&>{N4s_~PVsCG=w`H5XW%0DowFc5d07uPMuA<)wWzW4ASQq~zow}8jz1wy1ii(Pg a|CXO$&PYunDJs+e0000yNix%#5hc{eQt9tDs*D}wW#ECl_jxGohrY7R=w}zesMx~`jXre=W;+=ftvrv z{uQ70jk#{^BJ+aVtR>$C^B$V*ZPc@3W+*txuFhe#YFg-lFCdkku6{1-oD!MvTu@M@xm+*-4Iw{p?Dmj)jN1R{3RT-$9f#KeXGyh)mDDOL4 zDJdJ}6}hj)*s`6gqa$Oj>)NjoTU*Y&*?Mj9R%)vX4GatAn$9&6b)hxrS%^<~|u6{1-oD!M< DRc}rV literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi/meta.json b/Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi/meta.json new file mode 100644 index 00000000000000..8eb869acb39f8e --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/b9c06b16579dc828ac4d6f603995e083075725b2", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 6fa4e42044af5ecd61cc02e00618bcdcc948f54d Mon Sep 17 00:00:00 2001 From: EstKemran Date: Thu, 19 Sep 2024 00:09:36 +0300 Subject: [PATCH 10/47] turrets --- .../Entities/Objects/Weapons/Guns/turrets.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/turrets.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/turrets.yml index 1ea58d9ebdd544..d6760da4b26dfd 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/turrets.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/turrets.yml @@ -119,3 +119,17 @@ - type: NpcFactionMember factions: - SimpleHostile + +- type: entity + parent: BaseWeaponTurret + id: WeaponTurretDeathSquad + name: Турель + description: Турель с системой автоматического огня. + suffix: DS, Death Squad, Эскадрон Смерти + components: + - type: NpcFactionMember + factions: + - DeathSquad + - type: Gun + fireRate: 6 + soundGunshot: /Audio/Weapons/Guns/Gunshots/minigun.ogg From 4bd5d61106b7f62262863297ce61c64d635218a6 Mon Sep 17 00:00:00 2001 From: EstKemran Date: Thu, 19 Sep 2024 14:35:47 +0300 Subject: [PATCH 11/47] deathsquad-humanoid --- .../SS220/Entities/Mobs/Player/humanoid.yml | 220 ++++++++++++++++++ 1 file changed, 220 insertions(+) create mode 100644 Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml diff --git a/Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml new file mode 100644 index 00000000000000..e31b0a4ac9f9c1 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml @@ -0,0 +1,220 @@ +## Death Squad + +- type: randomHumanoidSettings + id: DeathSquadLeaderRandom + speciesBlacklist: #HumanPower + - Felinid + - Diona + - Arachnid + - Dwarf + - Moth + - Vox + - Reptilian + - Skeleton + - SlimePerson + - Vulpkanin + parent: EventHumanoidMindShielded + randomizeName: false + components: + - type: GhostRole + allowMovement: true + allowSpeech: true + makeSentient: true + requirements: + - !type:DepartmentTimeRequirement + department: Security + time: 72000 + - !type:DepartmentTimeRequirement + department: Command + time: 36000 + name: Командир Эскадрона Смерти + description: "Командир элитного отряда зачистки НаноТрейзен - Эскадрона Смерти. Приготовьтесь к массированному наступлению на станцию. Ваша задача, как тяжеловооружённого оперативника, - уничтожить всё живое на своём пути. И никаких свидетелей." + - type: GhostTakeoverAvailable + - type: ZombieImmune + - type: MobThresholds + thresholds: + 0: Alive + 170: Critical + 220: Dead + - type: Stamina + critThreshold: 200 + decay: 6 + cooldown: 1 + - type: SlowOnDamage + speedModifierThresholds: + 80: 0.9 + 140: 0.7 + 160: 0.5 + - type: Loadout + prototypes: [ DeathSquadLeaderGear ] + - type: AutoImplant + implants: + - DeathAcidifierImplant + - FreedomImplant + - MindShieldImplant + - type: NpcFactionMember + factions: + - DeathSquad + - type: StatusEffects + allowed: + - Stun + - KnockedDown + - SlowedDown + - Stutter + - Electrocution + - SlurredSpeech + - RatvarianLanguage + - PressureImmunity + - StaminaModifier + - type: Thirst + startingThirst: 2500 # spawn with Okay thirst state + thresholds: + OverHydrated: 3500 + Okay: 2500 + Thirsty: 1500 + Parched: 1000 + Dead: 0 + baseDecayRate: 0.0001 + - type: Hunger + currentHunger: 2500 # spawn with Okay hunger state + thresholds: + Overfed: 3500 + Okay: 2500 + Peckish: 1500 + Starving: 1000 + Dead: 0 + baseDecayRate: 0.0001 + - type: PassiveDamage + allowedStates: + - Alive + damageCap: 170 + damage: + groups: + Brute: -1 + Burn: -1 + Toxin: -1 + +- type: randomHumanoidSettings + id: DeathSquadHealerRandom + parent: DeathSquadLeaderRandom + components: + - type: GhostRole + requirements: + - !type:DepartmentTimeRequirement + department: Security + time: 54000 + - !type:DepartmentTimeRequirement + department: Medical + time: 36000 + name: Специалист Эскадрона Смерти + description: "Специалист элитного отряда зачистки НаноТрейзен - Эскадрона Смерти. Приготовьтесь к массированному наступлению на станцию. Ваша задача, как тяжеловооружённого оперативника, - уничтожить всё живое на своём пути. И никаких свидетелей." + - type: Loadout + prototypes: [ DeathSquadHealerGear ] + - type: PassiveDamage + allowedStates: + - Alive + damageCap: 170 + damage: + groups: + Brute: -0.8 + Burn: -0.8 + Toxin: -0.8 + +- type: randomHumanoidSettings + id: DeathSquadOperativeRandom + parent: DeathSquadLeaderRandom + components: + - type: GhostRole + requirements: + - !type:DepartmentTimeRequirement + department: Security + time: 54000 + name: Оперативник Эскадрона Смерти + description: "Офицер элитного отряда зачистки НаноТрейзен - Эскадрона Смерти. Приготовьтесь к массированному наступлению на станцию. Ваша задача, как тяжеловооружённого оперативника, - уничтожить всё живое на своём пути. И никаких свидетелей." + - type: Loadout + prototypes: [ DeathSquadOperativeGear ] + - type: PassiveDamage + allowedStates: + - Alive + damageCap: 150 + damage: + groups: + Brute: -0.6 + Burn: -0.6 + Toxin: -0.6 + +- type: entity + name: командир Эскадрона Смерти + parent: RandomHumanoidSpawnerERTLeader + id: MobHumanDeathSquadLeader + suffix: роль ЭС, Death Squad + components: + - type: Sprite + sprite: SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi + state: icon + - type: RandomHumanoidAppearance + randomizeName: false + - type: RandomMetadata + nameSegments: + - NamesFirstMilitaryLeader + - NamesLastMilitary + - type: RandomHumanoidSpawner + settings: DeathSquadLeaderRandom + +- type: entity + name: специалист Эскадрона Смерти + parent: RandomHumanoidSpawnerERTLeader + id: MobHumanDeathSquadHealer + suffix: роль ЭС, Death Squad + components: + - type: Sprite + sprite: SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi + state: icon + - type: RandomHumanoidAppearance + randomizeName: false + - type: RandomMetadata + nameSegments: + - NamesFirstMilitaryLeader + - NamesLastMilitary + - type: RandomHumanoidSpawner + settings: DeathSquadHealerRandom + +- type: entity + parent: RandomHumanoidSpawnerERTLeader + id: MobHumanDeathSquadOperative + name: оперативник Эскадрона Смерти + suffix: роль ЭС, Death Squad + components: + - type: Sprite + sprite: Clothing/OuterClothing/Hardsuits/deathsquad.rsi + state: icon + - type: RandomHumanoidAppearance + randomizeName: false + - type: RandomMetadata + nameSegments: + - NamesFirstMilitaryLeader + - NamesLastMilitary + - type: RandomHumanoidSpawner + settings: DeathSquadOperativeRandom + +- type: startingGear + id: DeathSquadLeaderGear + equipment: + jumpsuit: ClothingUniformJumpsuitDeathSquad + # id: DeathsquadCommanderPDA + # ears: ClothingHeadsetDeathsquad + pocket1: DoorRemoteCommand + +- type: startingGear + id: DeathSquadHealerGear + equipment: + jumpsuit: ClothingUniformJumpsuitDeathSquad + # id: DeathsquadHealerPDA + # ears: ClothingHeadsetDQ + +- type: startingGear + id: DeathSquadOperativeGear + equipment: + jumpsuit: ClothingUniformJumpsuitDeathSquad + id: DeathsquadPDA + # ears: ClothingHeadsetDQ From d2b91a55e167c4a899f8d424bbc6ebf5086114e7 Mon Sep 17 00:00:00 2001 From: EstKemran Date: Thu, 19 Sep 2024 16:28:13 +0300 Subject: [PATCH 12/47] id&pda&jobs --- .../Entities/Objects/Devices/pda.yml | 2 +- .../Roles/Jobs/CentComm/deathsquad.yml | 4 +- .../SS220/Entities/Mobs/Player/humanoid.yml | 4 +- .../SS220/Entities/Objects/Devices/pda.yml | 20 ++++++- .../Objects/Misc/identification_cards.yml | 51 ++++++++++++++++++ .../SS220/Roles/Jobs/CentComm/deathsquad.yml | 29 ++++++++++ .../SS220/Roles/play_time_trackers.yml | 7 +++ .../Prototypes/SS220/StatusIcons/centcom.yml | 23 ++++++++ .../Misc/job_icons.rsi/deathsquad.png | Bin 0 -> 168 bytes .../Misc/job_icons.rsi/deathsquadalpha.png | Bin 0 -> 177 bytes .../Misc/job_icons.rsi/deathsquadleader.png | Bin 0 -> 185 bytes .../Interface/Misc/job_icons.rsi/meta.json | 11 +++- 12 files changed, 144 insertions(+), 7 deletions(-) create mode 100644 Resources/Prototypes/SS220/Roles/Jobs/CentComm/deathsquad.yml create mode 100644 Resources/Prototypes/SS220/StatusIcons/centcom.yml create mode 100644 Resources/Textures/SS220/Interface/Misc/job_icons.rsi/deathsquad.png create mode 100644 Resources/Textures/SS220/Interface/Misc/job_icons.rsi/deathsquadalpha.png create mode 100644 Resources/Textures/SS220/Interface/Misc/job_icons.rsi/deathsquadleader.png diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 2d44bf7e61675c..acbdaf273ea3a0 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -1253,7 +1253,7 @@ suffix: Death Squad components: - type: Pda - id: CentcomIDCardDeathsquad + id: CentcomIDCardDeathsquadOperative #SS220-DeathSquad Update state: pda-deathsquad #SS220 PDA-Resprite - type: PdaBorderColor #SS220 PDA-Resprite borderColor: "#212129" #SS220 PDA-Resprite diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml b/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml index 61b20d66ff9dac..faf64c93a94f4a 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml @@ -4,8 +4,8 @@ description: job-description-deathsquad playTimeTracker: JobDeathSquad setPreference: false - startingGear: DeathSquadGear - icon: "JobIconNanotrasen" + startingGear: DeathSquadOperativeGear #SS220-DeathSquad Update + icon: "JobIconDeathsquadOperative" #SS220-DeathSquad Update supervisors: job-supervisors-centcom canBeAntag: false accessGroups: diff --git a/Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml index e31b0a4ac9f9c1..66ed5df0613808 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml @@ -201,7 +201,7 @@ id: DeathSquadLeaderGear equipment: jumpsuit: ClothingUniformJumpsuitDeathSquad - # id: DeathsquadCommanderPDA + id: DeathsquadCommanderPDA # ears: ClothingHeadsetDeathsquad pocket1: DoorRemoteCommand @@ -209,7 +209,7 @@ id: DeathSquadHealerGear equipment: jumpsuit: ClothingUniformJumpsuitDeathSquad - # id: DeathsquadHealerPDA + id: DeathsquadHealerPDA # ears: ClothingHeadsetDQ - type: startingGear diff --git a/Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml index bffd9cc6776b73..13a0aa7c635ec1 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml @@ -53,4 +53,22 @@ map: [ "enum.PdaVisualLayers.IdLight" ] visible: false #SS220 PDA-Resprite-End - type: Icon - state: pda-seniorservice \ No newline at end of file + state: pda-seniorservice + +- type: entity + parent: DeathsquadPDA + id: DeathsquadCommanderPDA + suffix: Death Squad Commander + components: + - type: Pda + id: CentcomIDCardDeathsquadCommander + state: pda-deathsquad + +- type: entity + parent: DeathsquadPDA + id: DeathsquadHealerPDA + suffix: Death Squad Healer + components: + - type: Pda + id: CentcomIDCardDeathsquadHealer + state: pda-deathsquad diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml index 0dfa1e1380bfd4..c9eb851d14320f 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml @@ -123,3 +123,54 @@ groups: - AllAccess # SS220 Fast fix access - CentralCommand + +# Deathsquad +- type: entity + parent: IDCardStandard + id: CentcomIDCardDeathsquadOperative + name: ID карта оперативника Эскадрона Смерти + components: + - type: Sprite + layers: + - state: deathsquad + - type: Item + heldPrefix: blue + - type: IdCard + jobTitle: Эскадрон Смерти + fullName: Оперативник + - type: Access + groups: + - AllAccess + tags: + - CentralCommandDeathSquad + - CentralCommand + - type: PresetIdCard + job: DeathSquad + +- type: entity + parent: CentcomIDCardDeathsquadOperative + id: CentcomIDCardDeathsquadCommander + name: ID карта командира Эскадрона Смерти + components: + - type: Sprite + layers: + - state: deathsquad + - type: IdCard + jobTitle: Эскадрон Смерти + fullName: Командир + - type: PresetIdCard + job: DeathsquadCommander + +- type: entity + parent: CentcomIDCardDeathsquadOperative + id: CentcomIDCardDeathsquadHealer + name: ID карта специалиста Эскадрона Смерти + components: + - type: Sprite + layers: + - state: deathsquad + - type: IdCard + jobTitle: Эскадрон Смерти + fullName: Специалист + - type: PresetIdCard + job: DeathsquadHealer diff --git a/Resources/Prototypes/SS220/Roles/Jobs/CentComm/deathsquad.yml b/Resources/Prototypes/SS220/Roles/Jobs/CentComm/deathsquad.yml new file mode 100644 index 00000000000000..4db6186cc7efe7 --- /dev/null +++ b/Resources/Prototypes/SS220/Roles/Jobs/CentComm/deathsquad.yml @@ -0,0 +1,29 @@ +- type: job + id: DeathsquadCommander + name: командир Эскадрона Смерти + description: job-description-deathsquad + playTimeTracker: JobDeathSquadCommander + setPreference: false + startingGear: DeathSquadLeaderGear + icon: "JobIconDeathsquadCommander" + supervisors: job-supervisors-centcom + canBeAntag: false + accessGroups: + - AllAccess + access: + - CentralCommand + +- type: job + id: DeathsquadHealer + name: специалист Эскадрона Смерти + description: job-description-deathsquad + playTimeTracker: JobDeathSquadHealer + setPreference: false + startingGear: DeathSquadHealerGear + icon: "JobIconDeathsquadHealer" + supervisors: job-supervisors-centcom + canBeAntag: false + accessGroups: + - AllAccess + access: + - CentralCommand diff --git a/Resources/Prototypes/SS220/Roles/play_time_trackers.yml b/Resources/Prototypes/SS220/Roles/play_time_trackers.yml index 974f8fe1a6f4a4..cc9ea202ef04da 100644 --- a/Resources/Prototypes/SS220/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/SS220/Roles/play_time_trackers.yml @@ -49,3 +49,10 @@ - type: playTimeTracker id: AntagInitialInfected + +# Centcom +- type: playTimeTracker + id: JobDeathSquadCommander + +- type: playTimeTracker + id: JobDeathSquadHealer diff --git a/Resources/Prototypes/SS220/StatusIcons/centcom.yml b/Resources/Prototypes/SS220/StatusIcons/centcom.yml new file mode 100644 index 00000000000000..af4582aa64877d --- /dev/null +++ b/Resources/Prototypes/SS220/StatusIcons/centcom.yml @@ -0,0 +1,23 @@ +- type: jobIcon + parent: JobIcon + id: JobIconDeathsquadOperative + icon: + sprite: /Textures/SS220/Interface/Misc/job_icons.rsi + state: deathsquad + jobName: job-name-deathsquade + +- type: jobIcon + parent: JobIcon + id: JobIconDeathsquadCommander + icon: + sprite: /Textures/SS220/Interface/Misc/job_icons.rsi + state: deathsquadleader + jobName: job-name-deathsquadecommander + +- type: jobIcon + parent: JobIcon + id: JobIconDeathsquadHealer + icon: + sprite: /Textures/SS220/Interface/Misc/job_icons.rsi + state: deathsquadalpha + jobName: job-name-deathsquadehealer diff --git a/Resources/Textures/SS220/Interface/Misc/job_icons.rsi/deathsquad.png b/Resources/Textures/SS220/Interface/Misc/job_icons.rsi/deathsquad.png new file mode 100644 index 0000000000000000000000000000000000000000..893b22a43e1d69097d30bef00c499a5ffae3be6f GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^93afW3?x5a^xFxf7>k44ofy`glX(f`NCfzVxc>kD zpVz=w*s~PKU=vg3R5D|i)Zo@|T-@}s38cFu$S;@yC4v}we-Sv`#Y$9DL{ZgGtmMpd6*uU`XoF?hQAxvXk44ofy`glX(f`$OZU>xc>kD zpVz=w*s~PKU=vg3R5D|i)Zo@|++<-9D=QmtiGdBMlB*=hFPH(S0s`tfMZ$oh+MX_s zAsjQ46CSWIv$6T{r71jkkn$jfjah(M$OJiN`=~ N44$rjF6*2UngDwuI2Ql_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Interface/Misc/job_icons.rsi/deathsquadleader.png b/Resources/Textures/SS220/Interface/Misc/job_icons.rsi/deathsquadleader.png new file mode 100644 index 0000000000000000000000000000000000000000..0500f17f4266ff75404be4374dca191da4f56b5e GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^93afW3?x5a^xFxf7>k44ofy`glX(f`s08?gxc>kD zpVz=w*s~PKU=vg3R5D|i)Zo@|-0$G9z}$SBzWyc)i=dkRbf9{kk|4ie2B10^;5-tb z1{Bx!ba4#fn3%J`kdU67@R*HRfLY_nxn3Qn@WbcMp5se8u!WhyeG21O TTVqWFpf(0iS3j3^P6 Date: Sun, 20 Oct 2024 00:02:51 +0300 Subject: [PATCH 13/47] shotgun --- .../Weapons/Guns/Battery/battery_guns.yml | 38 ++++++++++ .../Weapons/Guns/Projectiles/projectiles.yml | 45 +++++++++++- .../redprojectile.rsi/greenlaser.png | Bin 0 -> 353 bytes .../Projectiles/redprojectile.rsi/meta.json | 5 +- .../Weapons/Guns/pulse_shotgun.rsi/base.png | Bin 0 -> 309 bytes .../pulse_shotgun.rsi/equipped-BACKPACK.png | Bin 0 -> 1292 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 1423 bytes .../pulse_shotgun.rsi/heal-mag-unshaded-1.png | Bin 0 -> 160 bytes .../pulse_shotgun.rsi/heal-mag-unshaded-2.png | Bin 0 -> 147 bytes .../pulse_shotgun.rsi/heal-mag-unshaded-3.png | Bin 0 -> 149 bytes .../pulse_shotgun.rsi/heal-mag-unshaded-4.png | Bin 0 -> 149 bytes .../Weapons/Guns/pulse_shotgun.rsi/icon.png | Bin 0 -> 320 bytes .../Guns/pulse_shotgun.rsi/inhand-left.png | Bin 0 -> 330 bytes .../Guns/pulse_shotgun.rsi/inhand-right.png | Bin 0 -> 327 bytes .../Guns/pulse_shotgun.rsi/mag-unshaded-1.png | Bin 0 -> 160 bytes .../Guns/pulse_shotgun.rsi/mag-unshaded-2.png | Bin 0 -> 147 bytes .../Guns/pulse_shotgun.rsi/mag-unshaded-3.png | Bin 0 -> 149 bytes .../Guns/pulse_shotgun.rsi/mag-unshaded-4.png | Bin 0 -> 149 bytes .../Weapons/Guns/pulse_shotgun.rsi/meta.json | 65 ++++++++++++++++++ .../pulse_shotgun.rsi/wielded-inhand-left.png | Bin 0 -> 792 bytes .../wielded-inhand-right.png | Bin 0 -> 805 bytes 21 files changed, 150 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Projectiles/redprojectile.rsi/greenlaser.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/base.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/heal-mag-unshaded-1.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/heal-mag-unshaded-2.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/heal-mag-unshaded-3.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/heal-mag-unshaded-4.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/icon.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/meta.json create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/wielded-inhand-right.png diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index e02e2eba8c39ea..98b1173b8a7096 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -24,3 +24,41 @@ name: режим для УНИЧТОЖЕНИЯ fireCost: 5 soundGunshot: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg + +- type: entity + name: пульсовый дробовик + parent: WeaponPulseRifle + id: WeaponPulseShotgun + description: Энергетическая дробовик с новейшей техников лечения. + suffix: Винтовка, Death Squad, Эскадрон Смерти + components: + - type: Sprite + sprite: SS220/Objects/Weapons/Guns/pulse_shotgun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: SS220/Objects/Weapons/Guns/pulse_shotgun.rsi + - type: Gun + fireRate: 2.5 + - type: HitscanBatteryAmmoProvider + proto: Pulse2 + fireCost: 100 + - type: Battery + maxCharge: 400 + startingCharge: 400 +- type: BatteryWeaponFireModes + fireModes: + - proto: BulletLaserDestroy + name: режим для УНИЧТОЖЕНИЯ + fireCost: 40 + soundGunshot: /Audio/Weapons/Guns/Gunshots/taser2.ogg + magState: mag + - proto: BulletLaserHeal + name: режим для лечения + fireCost: 62.5 + soundGunshot: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg + magState: heal-mag diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 6b016bff0f7f7a..944fb9e9f85199 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -113,14 +113,14 @@ #Spider queen - type: entity - id: PoisonousAcid + id: PoisonousAcid name: poisonous Spit parent: BaseBullet categories: [ HideSpawnMenu ] components: - type: Projectile damage: - types: + types: Poison: 6 Structural: 2 - type: Sprite @@ -189,3 +189,44 @@ impactFlash: sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi state: impact_blue + +- type: entity + name: laser bolt + id: BulletLaserDestroy + parent: BulletLaser + categories: [ HideSpawnMenu ] + components: + - type: Projectile + impactEffect: BulletImpactEffectOrangeDisabler + damage: + types: + Heat: 22 + - type: ProjectileSpread + proto: BulletLaser + count: 5 + spread: 30 + +- type: entity + name: laser bolt + id: BulletLaserHeal + parent: BulletLaser + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: SS220/Objects/Weapons/Guns/Projectiles/redprojectile.rsi + layers: + - state: greenlaser + - type: Projectile + impactEffect: BulletImpactEffectOrangeDisabler + damage: + types: + Blunt: -10 + Slash: -12 + Piercing: -20 + Heat: -14 + Radiation: 4 + Poison: -8 + - type: ProjectileSpread + proto: BulletLaser + count: 3 + spread: 30 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Projectiles/redprojectile.rsi/greenlaser.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Projectiles/redprojectile.rsi/greenlaser.png new file mode 100644 index 0000000000000000000000000000000000000000..6685dfe18a92d5abbc1c8f86861e1f5c2e6e4ebc GIT binary patch literal 353 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/heal-mag-unshaded-2.png b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/heal-mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..95edd605639813b23c2a583da03f30bae00a45e5 GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNBpBcm;tHf0LM9un`oEvSWg?KxToU9L%<%ueOTaZnAXmiG#WAE}PIAHm ic7YbdDKC;_MHv}X{xFzm=dkVv>GgE=b6Mw<&;$TBr6HvN literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/heal-mag-unshaded-3.png b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/heal-mag-unshaded-3.png new file mode 100644 index 0000000000000000000000000000000000000000..9ae33de4465edefdd3fa6953b307ccdd34f08405 GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNBpBcm;tHf0LM9un`oEvSWg?KxToU9L%<%ueOTaZnAXm)O#WAE}PIAHm kb^(zFqbVXUlH|WKFu3(Fq*OUipAORP>FVdQ&MBb@0EsLk9{>OV literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/heal-mag-unshaded-4.png b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/heal-mag-unshaded-4.png new file mode 100644 index 0000000000000000000000000000000000000000..d7b0e74adb1d4d498ecd2001973f2860cdb03d70 GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNBpBcm;tHf0LM9un`oEvSWg?KxToU9L%<%ueOTaZnAXm)O#WAE}PIAHm lb^(zVqbXBfB*}keVDMPVkRIhy24pcXc)I$ztaD0e0sxv}Bi{f3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/icon.png b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..65097d929c52767b12d95e24ec45c21928622ddc GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkP|!HQC&U#{ka;i{~H_~_7(myDCdu4i&u&&c?5J6gQu&X%Q~loCIGG*cg_F+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/inhand-left.png b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..440e5edff513970041ea17e601e5a33ff66b13fc GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND5w(P6XFV_m6erUU0p*%L+$MBQc_ZkR{duPnXIX)>E-2>^`F7S#3Wvz z^)^r)Pf3tpFvEWY;5-tb1{7cJ>EaktF()}ef>l}AKqyE-g(00QAyi?FhXZ5tM2;Cr z2NlmASRfO|u;>(1!49{E(hQcsrzSAc5^kD-V|H#X)vr{1SSLJUWIClJ zZQw2F@sWW|XQgqAp>Kl-f5HLTs~xU#K{gHtc-DMUmSkWM?-iT5>R;|XppzLqUHx3v IIVCg!04Qi^R{#J2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/inhand-right.png b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..f23c6c207e113eefae8f4bdf5abfc715b0b1844c GIT binary patch literal 327 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND5xIb6XFV_m6erUU0p*%L+$MB7(yl+t@@vmlH%p%m71EWsi|pVVv_Zr zq5Y=PJfKqEk|4iehW|)Fm&I`{P-20ni(^Q|oa6)vR%KoTp&$j7244}y6DxY+8M`Mi z@=bPC2#IKA;+yWv&2Vwe%UGTpYahJwVZE3q%3TpC*O?qoSDa$Z0m|u~IF$?0q19U5cr>mdKI;Vst E06sTqAOHXW literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/mag-unshaded-1.png b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000000000000000000000000000000000..1ec414aa7089e2ed1ac3b084a23959aebdc56d4a GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND99h+6XFV_8A2u-t@{6;fx(`E;e3@=15kvuB*-tA;Xe?_Tu=iUFX`#x v7*a7OIYHu9gJ5g}=X9?$_E}abGng2{85rD;J83QhDq`?-^>bP0l+XkK$rLB! literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/mag-unshaded-2.png b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..95edd605639813b23c2a583da03f30bae00a45e5 GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNBpBcm;tHf0LM9un`oEvSWg?KxToU9L%<%ueOTaZnAXmiG#WAE}PIAHm ic7YbdDKC;_MHv}X{xFzm=dkVv>GgE=b6Mw<&;$TBr6HvN literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/mag-unshaded-3.png b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000000000000000000000000000000000..9ae33de4465edefdd3fa6953b307ccdd34f08405 GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNBpBcm;tHf0LM9un`oEvSWg?KxToU9L%<%ueOTaZnAXm)O#WAE}PIAHm kb^(zFqbVXUlH|WKFu3(Fq*OUipAORP>FVdQ&MBb@0EsLk9{>OV literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/mag-unshaded-4.png b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000000000000000000000000000000000..d7b0e74adb1d4d498ecd2001973f2860cdb03d70 GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNBpBcm;tHf0LM9un`oEvSWg?KxToU9L%<%ueOTaZnAXm)O#WAE}PIAHm lb^(zVqbXBfB*}keVDMPVkRIhy24pcXc)I$ztaD0e0sxv}Bi{f3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/meta.json new file mode 100644 index 00000000000000..206c42b4b27c94 --- /dev/null +++ b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/27386/commits/4814da0f8e0d88f430c8b335e541e0a7734755a2 backpack sprite by Peptide (copy of pulse rifle), backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244, modified by Estkemran (Github) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "heal-mag-unshaded-1" + }, + { + "name": "heal-mag-unshaded-2" + }, + { + "name": "heal-mag-unshaded-3" + }, + { + "name": "heal-mag-unshaded-4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/wielded-inhand-left.png b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..b9df7a2cb2de40ba7406aa0912b1e3fbbdd912c0 GIT binary patch literal 792 zcmV+z1LypSP)Lzj9grS$)3rmo2l@IO+>;ELiU zi#!B-a6E)y1Tsdgp}bBfBwJE0L`pNf-}21e(|vcG?{0V>z%UHMFbu;m48t%HLwSzr&Y=8JUBRzUexXFEj;TJUj6)n%hvZOI-_&+`~8aJI0OLw zem_$)p5r(U<>eN|v$RIrw#l|_3W5O5W)tJ_I5#$%O|;u>yng=~AHIG|L|xZm7zXLO z4qexyMK0qwPLw0^!)XE9Uoyn zpQF`kB_aU0t_$UtjV=J7i(aFFzg-*Q&JFgo!$S`EJMr%uH8eQa)SM%rN*Ci=VG zuEg?z_0u!pY;`SJWd6kr!=T}CnCQ1Gi^4EOwOU15+}PNF=Xr^5_V@P*07jz`R8_@n zHpB9`LQhc?Os7-S>vaIY#l^*gk3iZw;-nsdEVj0`a^q|^Tlppkg2XN?7K_xeiMG>g)e zE;m`0MXIW1_AmPboY6Ued_RB;cX<@jbZ>5Mu)V!4r7u+(vTd8z*4A=80>U5g=IzJG z7m()%kk!4*qp<8t5WWIgeW~3MWv<^ZhIsb_@Q;sHa$MJiq9|xI8gN|~s;Z(^t6?&k zq?W_W&=np8QHqz*m!6nm7?kA;5K#z;Gn?lJC_@(jc6WDaI-NpRzfgaGKv9(Fca|TZ z3|*mjAN?Y0?vXdZG);<|CDQx=MQbh-e>qCjU*&&V=ANQe@6mXwUPXps7=~e(C(A$C W$E`fE9NyUg00006I1#54gVIL2g%23Z(`mSQ5PZ9*Vp$p^?-3e6ZwzeJ~I>d+|&@WuqRRE`_rzzKU)oK0}&%VFmN99Ac57>k zVzEfESft%<$F`p5Q7V;GsZ^S1B}c{V@9!rX(ofIFvaE2C2ZTGI+wHQvyo~30 z00cq6?Yk1+3I%R!C29cF`0D$V%Vhv6l?uIHFVd!uj_L0}uh--1>WXwaJxT5W;T&|* zN5^nHKDJh?MXrM&0HE1yva+&5x7&?854VGD+sZHuuCK4j=koxZoSa0qi{m(|-|w@u zv_udDBinkt9*MDSTU}gSOuUt+jT>frds_jtS}n5KEWYofj~jjhH#aw7kmq?LSHbsv z0M^#lV%vFAtyb0U?rwNc59gxi3EB=AoVcA%Cp8FeG#bMzpm>CXY1UM$Rh7wPXti45 zy+)&v(sN8SP}1MspT_Vmh~vq)4z_J8xce{vO`M;f&wC1jAP9mW2!bF8f*=TjAP9o+ zPZ8%8Filg3EfV*1zD6hacf53z}kJR7XJK*_?*NJo&7Z(%j#=a%nw$;YQ2A=1IWpmH-C=?1b zn@xPpE1;A4^qDU^@U(3MFm0K8Sif8@Kf3PN7clS)0A#aS&d$yvo`N{9KoA5|CqGJm zP}O}*-Plh+ucaG?aj&)xv-JuL>(4?r_ATirYD`UiW}X3E-!Kf_uP{HK!n`~Kli2hA jkBJC^AP9mW2*1Zqpt_@unLRm900000NkvXXu0mjf^|*ln literal 0 HcmV?d00001 From 19a3741b1ce7275012d3c822a2b7a1395e80ee87 Mon Sep 17 00:00:00 2001 From: EstKemran Date: Sun, 20 Oct 2024 00:17:14 +0300 Subject: [PATCH 14/47] fix-shotgun --- .../Objects/Weapons/Guns/Battery/battery_guns.yml | 15 +++++---------- .../Weapons/Guns/Projectiles/projectiles.yml | 6 +++--- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 98b1173b8a7096..8b59ed1401d7cc 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -42,23 +42,18 @@ shader: unshaded - type: Clothing sprite: SS220/Objects/Weapons/Guns/pulse_shotgun.rsi - - type: Gun - fireRate: 2.5 - - type: HitscanBatteryAmmoProvider - proto: Pulse2 - fireCost: 100 - type: Battery - maxCharge: 400 - startingCharge: 400 -- type: BatteryWeaponFireModes + maxCharge: 40 + startingCharge: 40 + - type: BatteryWeaponFireModes fireModes: - proto: BulletLaserDestroy name: режим для УНИЧТОЖЕНИЯ - fireCost: 40 + fireCost: 1 soundGunshot: /Audio/Weapons/Guns/Gunshots/taser2.ogg magState: mag - proto: BulletLaserHeal name: режим для лечения - fireCost: 62.5 + fireCost: 1.75 soundGunshot: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg magState: heal-mag diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 2179f2f68488e9..97f615f0da786c 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -218,7 +218,7 @@ - type: ProjectileSpread proto: BulletLaser count: 5 - spread: 30 + spread: 15 - type: entity name: laser bolt @@ -241,6 +241,6 @@ Radiation: 4 Poison: -8 - type: ProjectileSpread - proto: BulletLaser + proto: BulletLaserHeal count: 3 - spread: 30 + spread: 10 From c9d74e7d1dcc35d7133f7c6c207ae2de963be4a1 Mon Sep 17 00:00:00 2001 From: EstKemran Date: Sun, 20 Oct 2024 14:24:06 +0300 Subject: [PATCH 15/47] localization --- .../ru-RU/ss220/clothing/Hands/gloves.ftl | 6 +++- .../ru-RU/ss220/clothing/Head/hardsuits.ftl | 6 ++++ .../clothing/OuterClothing/hardsuits.ftl | 6 ++++ .../ru-RU/ss220/clothing/Shoes/boots.ftl | 3 ++ Resources/Locale/ru-RU/ss220/job/job-name.ftl | 3 ++ .../entities/mobs/player/humanoid.ftl | 6 ++++ .../objects/specific/medical/hypospray.ftl | 3 ++ .../entities/objects/weapons/gun/battery.ftl | 10 +++++++ .../entities/objects/weapons/gun/smg.ftl | 3 ++ .../entities/objects/weapons/gun/turret.ftl | 3 ++ .../entities/objects/weapons/melee/swords.ftl | 4 +++ .../ru-RU/ss220/reagents/meta/medicine.ftl | 5 +++- .../SS220/Entities/Clothing/Hand/hands.yml | 4 +-- .../Clothing/Head/hardsuit-helmets.yml | 12 ++++---- .../Clothing/OuterClothing/hardsuits.yml | 8 ++--- .../SS220/Entities/Clothing/Shoes/boots.yml | 4 +-- .../SS220/Entities/Mobs/Player/humanoid.yml | 30 +++++++------------ .../Objects/Specific/Medical/hypospray.yml | 6 ++-- .../Weapons/Guns/Battery/battery_guns.yml | 20 ++++++------- .../Weapons/Guns/Projectiles/projectiles.yml | 5 ++-- .../Objects/Weapons/Guns/SMGs/smgs.yml | 4 +-- .../Entities/Objects/Weapons/Guns/turrets.yml | 4 +-- .../Entities/Objects/Weapons/Melee/sword.yml | 8 ++--- .../Prototypes/SS220/Reagents/medicine.yml | 4 +-- .../SS220/Roles/Jobs/CentComm/deathsquad.yml | 4 +-- 25 files changed, 108 insertions(+), 63 deletions(-) create mode 100644 Resources/Locale/ru-RU/ss220/clothing/Head/hardsuits.ftl create mode 100644 Resources/Locale/ru-RU/ss220/clothing/OuterClothing/hardsuits.ftl create mode 100644 Resources/Locale/ru-RU/ss220/clothing/Shoes/boots.ftl create mode 100644 Resources/Locale/ru-RU/ss220/prototypes/entities/mobs/player/humanoid.ftl create mode 100644 Resources/Locale/ru-RU/ss220/prototypes/entities/objects/specific/medical/hypospray.ftl create mode 100644 Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl create mode 100644 Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/smg.ftl create mode 100644 Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/turret.ftl diff --git a/Resources/Locale/ru-RU/ss220/clothing/Hands/gloves.ftl b/Resources/Locale/ru-RU/ss220/clothing/Hands/gloves.ftl index 4b7f14b7c8db63..081d7c2cd097fe 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/Hands/gloves.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/Hands/gloves.ftl @@ -4,4 +4,8 @@ ent-ClothingHandsGlovesNanotrasenDiplomat = белые перчатки Цент .desc = Пара высококачественных белых плотных перчаток, украшенных золотым шитьём, которые выдаются дипломату Nanotrasen. ent-ClothingHandsGlovesJanitorJR = черные резиновые перчатки .suffix = JR, За время в игре - .desc = Уборочные перчатки с дополнительным защитным покрытием. Они видели столь много... + .desc = Уборочные перчатки с дополнительным защитным покрытием. Они видели столь много... + +ent-ClothingHandsGlovesDQ = боевые перчатки Эскадрона Смерти + .suffix = Эскадрон Смерти, Death Squad, ЭС, DQ + .desc = Силовые перчатки, многократно усиливающие механическую силу удара. diff --git a/Resources/Locale/ru-RU/ss220/clothing/Head/hardsuits.ftl b/Resources/Locale/ru-RU/ss220/clothing/Head/hardsuits.ftl new file mode 100644 index 00000000000000..cea4225935ad36 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/clothing/Head/hardsuits.ftl @@ -0,0 +1,6 @@ +ent-ClothingHeadHelmetHardsuitDeathsquadCommander = шлем командира Эскадрона Смерти + .suffix = Эскадрон Смерти, Death Squad, ЭС, DQ + .desc = Шлем от костюм командира Эскадрона Смерти. +ent-ClothingHeadHelmetHardsuitDeathsquadAlpha = шлем специалиста Эскадрона Смерти + .suffix = Эскадрон Смерти, Death Squad, ЭС, DQ + .desc = Шлем от костюм специалиста Эскадрона Смерти. diff --git a/Resources/Locale/ru-RU/ss220/clothing/OuterClothing/hardsuits.ftl b/Resources/Locale/ru-RU/ss220/clothing/OuterClothing/hardsuits.ftl new file mode 100644 index 00000000000000..4abe34437899dc --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/clothing/OuterClothing/hardsuits.ftl @@ -0,0 +1,6 @@ +ent-ClothingOuterHardsuitDeathsquadCommander = скафандр командира Эскадрона Смерти + .suffix = Эскадрон Смерти, Death Squad, ЭС, DQ + .desc = Высокотехнологичный скафандр, предназначенный для командира отряда. +ent-ClothingOuterHardsuitDeathsquadAlpha = скафандр специалиста Эскадрона Смерти + .suffix = Эскадрон Смерти, Death Squad, ЭС, DQ + .desc = Высокотехнологичный скафандр, предназначенный для специалистов отряда. diff --git a/Resources/Locale/ru-RU/ss220/clothing/Shoes/boots.ftl b/Resources/Locale/ru-RU/ss220/clothing/Shoes/boots.ftl new file mode 100644 index 00000000000000..9f2f6f4c6d0ea4 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/clothing/Shoes/boots.ftl @@ -0,0 +1,3 @@ +ent-ClothingShoesBootsMagDQ = магнитные ботинки Эскадрона Смерти + .suffix = Эскадрон Смерти, Death Squad, ЭС, DQ + .desc = Самые современные магнитные ботинки в узнаваемых цветах. diff --git a/Resources/Locale/ru-RU/ss220/job/job-name.ftl b/Resources/Locale/ru-RU/ss220/job/job-name.ftl index abaa1ad08902f5..c3b851c4e4f929 100644 --- a/Resources/Locale/ru-RU/ss220/job/job-name.ftl +++ b/Resources/Locale/ru-RU/ss220/job/job-name.ftl @@ -13,3 +13,6 @@ job-name-ert-chaplain = священник ОБР job-name-nt-admiral = адмирал NanoTrasen job-name-nt-politician = дипломат NanoTrasen job-name-ussp = СССП + +job-name-dq-сommander = командир Эксадрона Смерти +job-name-dq-specialist = специалист Эксадрона Смерти diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/mobs/player/humanoid.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/mobs/player/humanoid.ftl new file mode 100644 index 00000000000000..5257fe2f7d586c --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/mobs/player/humanoid.ftl @@ -0,0 +1,6 @@ +ent-MobHumanDeathSquadLeader = командир Эскадрона Смерти + .suffix = Роль ЭС, Эскадрон Смерти, Death Squad, ЭС, DQ +ent-MobHumanDeathSquadHealer = специалист Эскадрона Смерти + .suffix = Роль ЭС, Эскадрон Смерти, Death Squad, ЭС, DQ +ent-MobHumanDeathSquadOperative = оперативник Эскадрона Смерти + .suffix = Роль ЭС, Эскадрон Смерти, Death Squad, ЭС, DQ diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/specific/medical/hypospray.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/specific/medical/hypospray.ftl new file mode 100644 index 00000000000000..e1da00a02d7e22 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/specific/medical/hypospray.ftl @@ -0,0 +1,3 @@ +ent-EmergencyMedipenDQ = божественный медипен + .suffix = Эскадрон Смерти, Death Squad, ЭС, DQ + .desc = Экстренный медипен, который в кратчайшие сроки ставит на ноги даже при самых тяжелых травмах. Из-за дороговизны и трудности производства применяется элитными отрядами. diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl new file mode 100644 index 00000000000000..cea51b2f89145d --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl @@ -0,0 +1,10 @@ +ent-WeaponPulseRifle2 = пульсовая винтовака + .suffix = Винтовка, Эскадрон Смерти, Death Squad, ЭС, DQ + .desc = Энергетическая винтовка тяжелого типа, способна разрушать структуры. +ent-ClothingHeadHelmetHardsuitDeathsquadAlpha = пульсовый дробовик + .suffix = Дробовик, Эскадрон Смерти, Death Squad, ЭС, DQ + .desc = Энергетическая дробовик с новейшей техников лечения. + +firemode-name-kill = режия для убийства +firemode-name-destroy = режим для УНИЧТОЖЕНИЯ +firemode-name-heal = режим для лечения diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/smg.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/smg.ftl new file mode 100644 index 00000000000000..4d09483832a4c6 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/smg.ftl @@ -0,0 +1,3 @@ +ent-WeaponRifleSP = SP-91-RC + .suffix = Пистолет-пулемёт, Эскадрон Смерти, Death Squad, ЭС, DQ + .desc = Крупный пистолет-пулемет использующий патроны калибра .45 магнум. diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/turret.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/turret.ftl new file mode 100644 index 00000000000000..577bfa0ebd21ef --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/turret.ftl @@ -0,0 +1,3 @@ +ent-WeaponTurretDeathSquad = турель + .suffix = Турель, Эскадрон Смерти, Death Squad, ЭС, DQ + .desc = Турель с системой автоматического огня. diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/melee/swords.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/melee/swords.ftl index cfeb52ee6a2108..a32086a122524c 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/melee/swords.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/melee/swords.ftl @@ -2,3 +2,7 @@ ent-JianSword = цзянь .desc = Древний церемониальный меч. ent-OfficerCutlass = офицерский кортик .desc = Богато украшенное наградное оружие, что является символом офицера флота Человечества. + +ent-Chainsword = цепной меч + .suffix = Эскадрон Смерти, Death Squad, ЭС, DQ + .desc = Технологии и ультранасилие в одном флаконе! diff --git a/Resources/Locale/ru-RU/ss220/reagents/meta/medicine.ftl b/Resources/Locale/ru-RU/ss220/reagents/meta/medicine.ftl index 741e402542b2ba..b42c7cd8039098 100644 --- a/Resources/Locale/ru-RU/ss220/reagents/meta/medicine.ftl +++ b/Resources/Locale/ru-RU/ss220/reagents/meta/medicine.ftl @@ -11,4 +11,7 @@ reagent-name-harai = харай reagent-desc-harai = Тёмно-фиолетовая паста, созданная для борьбы с феромонным штормом у арахнидов. Впервые была получена из пещерного растения на Ширре-1 reagent-name-nicotizine = Никотизин -reagent-desc-nicotizine = Низкоконцентрированная форма барозина смешанного с никотином, менее вредна для здоровья, согревает тело и предотвраящает повреждения от давления, используется в сигаретах. \ No newline at end of file +reagent-desc-nicotizine = Низкоконцентрированная форма барозина смешанного с никотином, менее вредна для здоровья, согревает тело и предотвраящает повреждения от давления, используется в сигаретах. + +reagent-name-holymolywater = эссенция святой воды +reagent-desc-holymolywater = Концентрированная святая вода, лечащая все болезни и даже смерть. diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Hand/hands.yml b/Resources/Prototypes/SS220/Entities/Clothing/Hand/hands.yml index b74c31d456f669..c95b72e109c1fd 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Hand/hands.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Hand/hands.yml @@ -70,8 +70,8 @@ - type: entity parent: ClothingHandsBase id: ClothingHandsGlovesDQ - name: боевые перчатки ЭС - description: Силовые перчатки, многократно усиливающие механическую силу удара. + name: DQ combat gloves + description: Power gloves that multiply the mechanical force of impact. components: - type: Insulated - type: Sprite diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/SS220/Entities/Clothing/Head/hardsuit-helmets.yml index 351981782c288c..c5453b2f77609f 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Head/hardsuit-helmets.yml @@ -54,8 +54,8 @@ - type: entity parent: ClothingHeadHardsuitWithLightBase id: ClothingHeadHelmetHardsuitDeathsquadCommander - name: шлем командира ЭС - description: Шлем от костюм командира ЭС. + name: the helmet of the commander of the DQ + description: The helmet from the Death Squad commander's costume. components: - type: BreathMask - type: Sprite @@ -81,8 +81,8 @@ - type: entity parent: ClothingHeadHardsuitWithLightBase id: ClothingHeadHelmetHardsuitDeathsquadAlpha - name: шлем специалиста ЭС - description: Шлем от скафандра специалиста ЭС + name: the helmet of the specialist of the DQ + description: The helmet from the Death Squad specialist's costume. components: - type: BreathMask - type: Sprite @@ -103,7 +103,7 @@ Heat: 0.80 Radiation: 0.80 Caustic: 0.95 - + #SuperMatter operator's Hardsuit - type: entity parent: ClothingHeadHardsuitWithLightBase @@ -121,4 +121,4 @@ radius: 6 - type: PressureProtection highPressureMultiplier: 0.32 - lowPressureMultiplier: + lowPressureMultiplier: diff --git a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml index 888b5528c22e8d..80f83a12be5c0f 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml @@ -68,8 +68,8 @@ - type: entity parent: ClothingOuterHardsuitBase id: ClothingOuterHardsuitDeathsquadCommander - name: скафандр командира ЭС - description: Высокотехнологичный скафандр, предназначенный для командира отряда. + name: the hardsuit of the commander of the DQ + description: A high-tech hardsuit designed for the squad commander. components: - type: Sprite sprite: SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi @@ -115,8 +115,8 @@ - type: entity parent: ClothingOuterHardsuitBase id: ClothingOuterHardsuitDeathsquadAlpha - name: скафандр специалиста ЭС - description: Высокотехнологичный скафандр предназначенный для специалистов отряда. + name: the hardsuit of the specialist of the DQ + description: A high-tech hardsuit designed for the squad specialist. components: - type: Sprite sprite: SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml index f9dfd37d6e5d22..52799f6207a3a8 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml @@ -69,8 +69,8 @@ - type: entity parent: [ClothingShoesBootsMagBase, BaseJetpack] id: ClothingShoesBootsMagDQ - name: магнитные ботинки Эскадрона Смерти - description: Самые современные магнитные ботинки в узнаваемых цветах. + name: Death Squad Magnetic Boots + description: The most modern magnetic shoes in recognizable colors. components: - type: Sprite sprite: SS220/Clothing/Shoes/Boots/dq_magboots.rsi diff --git a/Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml index 66ed5df0613808..58855681c4be5e 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml @@ -2,17 +2,7 @@ - type: randomHumanoidSettings id: DeathSquadLeaderRandom - speciesBlacklist: #HumanPower - - Felinid - - Diona - - Arachnid - - Dwarf - - Moth - - Vox - - Reptilian - - Skeleton - - SlimePerson - - Vulpkanin + speciesBlacklist: [ Felinid, Diona, Arachnid, Dwarf, Moth, Vox, Reptilian, Skeleton, SlimePerson, Vulpkanin, Tajaran] parent: EventHumanoidMindShielded randomizeName: false components: @@ -144,10 +134,10 @@ Toxin: -0.6 - type: entity - name: командир Эскадрона Смерти + name: commander of the Death Squadron parent: RandomHumanoidSpawnerERTLeader id: MobHumanDeathSquadLeader - suffix: роль ЭС, Death Squad + suffix: Death Squad components: - type: Sprite sprite: SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi @@ -162,10 +152,10 @@ settings: DeathSquadLeaderRandom - type: entity - name: специалист Эскадрона Смерти + name: specialist of the Death Squadron parent: RandomHumanoidSpawnerERTLeader id: MobHumanDeathSquadHealer - suffix: роль ЭС, Death Squad + suffix: Death Squad components: - type: Sprite sprite: SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi @@ -182,8 +172,8 @@ - type: entity parent: RandomHumanoidSpawnerERTLeader id: MobHumanDeathSquadOperative - name: оперативник Эскадрона Смерти - suffix: роль ЭС, Death Squad + name: operative of the Death Squadron + suffix: Death Squad components: - type: Sprite sprite: Clothing/OuterClothing/Hardsuits/deathsquad.rsi @@ -202,7 +192,7 @@ equipment: jumpsuit: ClothingUniformJumpsuitDeathSquad id: DeathsquadCommanderPDA - # ears: ClothingHeadsetDeathsquad + ears: ClothingHeadsetAltCentCom pocket1: DoorRemoteCommand - type: startingGear @@ -210,11 +200,11 @@ equipment: jumpsuit: ClothingUniformJumpsuitDeathSquad id: DeathsquadHealerPDA - # ears: ClothingHeadsetDQ + ears: ClothingHeadsetAltCentCom - type: startingGear id: DeathSquadOperativeGear equipment: jumpsuit: ClothingUniformJumpsuitDeathSquad id: DeathsquadPDA - # ears: ClothingHeadsetDQ + ears: ClothingHeadsetAltCentCom diff --git a/Resources/Prototypes/SS220/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/SS220/Entities/Objects/Specific/Medical/hypospray.yml index 18b937e4bd526f..029e3b20a945e4 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Specific/Medical/hypospray.yml @@ -1,9 +1,9 @@ - type: entity parent: ChemicalMedipen id: EmergencyMedipenDQ - name: божественный медипен - description: Экстренный медипен, который в кратчайшие сроки ставит на ноги даже при самых тяжелых травмах. Из-за дороговизны и трудности производства применяется элитными отрядами. - suffix: Shitspawn, Death Squad, Эскадрон Смерти + name: holymoly medicine + description: Emergency honey and foam, which puts you back on your feet in the shortest possible time, even with the most severe injuries. Due to the high cost and difficulty of production, it is used by elite units. + suffix: Shitspawn, Death Squad components: - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 8b59ed1401d7cc..5fdffe0db3cea2 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -1,11 +1,11 @@ # Новые прототипы пишите выше # Death Squad - type: entity - name: пульсовая винтовака + name: pulse rifle parent: WeaponPulseRifle id: WeaponPulseRifle2 - description: Энергетическая винтовка тяжелого типа, способна разрушать структуры. - suffix: Винтовка, Death Squad, Эскадрон Смерти + description: A heavy-duty energy rifle capable of destroying structures. + suffix: Винтовка, Death Squad components: - type: Gun fireRate: 2.5 @@ -18,19 +18,19 @@ - type: BatteryWeaponFireModes fireModes: - proto: Pulsekill - name: режия для убийства + name: firemode-name-kill fireCost: 1 - proto: PulseDESTROY - name: режим для УНИЧТОЖЕНИЯ + name: firemode-name-destroy fireCost: 5 soundGunshot: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg - type: entity - name: пульсовый дробовик + name: pulse shotgun parent: WeaponPulseRifle id: WeaponPulseShotgun - description: Энергетическая дробовик с новейшей техников лечения. - suffix: Винтовка, Death Squad, Эскадрон Смерти + description: An energy shotgun with the latest treatment technique. + suffix: Death Squad components: - type: Sprite sprite: SS220/Objects/Weapons/Guns/pulse_shotgun.rsi @@ -48,12 +48,12 @@ - type: BatteryWeaponFireModes fireModes: - proto: BulletLaserDestroy - name: режим для УНИЧТОЖЕНИЯ + name: firemode-name-kill fireCost: 1 soundGunshot: /Audio/Weapons/Guns/Gunshots/taser2.ogg magState: mag - proto: BulletLaserHeal - name: режим для лечения + name: firemode-name-heal fireCost: 1.75 soundGunshot: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg magState: heal-mag diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 97f615f0da786c..716298c6a47bfa 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -172,11 +172,12 @@ color: blue energy: 0.5 +# Death Squad - type: hitscan id: Pulsekill damage: types: - Heat: 20 + Heat: 30 Structural: 200 muzzleFlash: sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi @@ -192,7 +193,7 @@ id: PulseDESTROY damage: types: - Heat: 50 + Heat: 60 Structural: 600 muzzleFlash: sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 5e48277f3e1abf..c6f19ffa08cae0 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -2,8 +2,8 @@ parent: BaseWeaponSubMachineGun id: WeaponRifleSP name: SP-91-RC - description: Крупный пистолет-пулемет использующий патроны калибра .45 магнум. - suffix: Shitspawn, Death Squad, Эскадрон Смерти + description: A large submachine gun using caliber cartridges.45 magnum. + suffix: Death Squad components: - type: Sprite sprite: SS220/Objects/Weapons/Guns/sp-91.rsi diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/turrets.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/turrets.yml index d6760da4b26dfd..a2ca0595baaf66 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/turrets.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/turrets.yml @@ -123,8 +123,8 @@ - type: entity parent: BaseWeaponTurret id: WeaponTurretDeathSquad - name: Турель - description: Турель с системой автоматического огня. + name: turret + description: A turret with an automatic fire system. suffix: DS, Death Squad, Эскадрон Смерти components: - type: NpcFactionMember diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml index 305837626b76e8..387a8fe94d039a 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml @@ -47,7 +47,7 @@ description: A graceful and elegant weapon that is the perfect choice for those who prefer a sophisticated style during combat. suffix: 27 piercing components: - - type: EmitSoundOnLand ##new sound_drop effect, add MIXnikita + - type: EmitSoundOnLand ##new sound_drop effect, add MIXnikita sound: path: /Audio/SS220/Effects/Drop/cane_blade.ogg params: @@ -111,9 +111,9 @@ - type: entity parent: BaseItem id: Chainsword #todo Хуйня, переделать. - name: цепной меч - description: Технологии и ультранасилие в одном флаконе! - suffix: Death Squad, Эскадрон Смерти + name: chainsword + description: Technology and ultra-violence in one bottle! + suffix: Death Squad components: - type: EmitSoundOnLand sound: diff --git a/Resources/Prototypes/SS220/Reagents/medicine.yml b/Resources/Prototypes/SS220/Reagents/medicine.yml index ea88f9bd21f81f..420e38236ab273 100644 --- a/Resources/Prototypes/SS220/Reagents/medicine.yml +++ b/Resources/Prototypes/SS220/Reagents/medicine.yml @@ -162,9 +162,9 @@ - type: reagent id: HolyMolyWater - name: эссенция святой воды + name: the essence of holy water group: Medicine - desc: Концентрированная святая вода, лечащая все болезни и даже смерть. + desc: Concentrated holy water that cures all diseases and even death. physicalDesc: невозможное flavor: HolyMoly color: "#e8e8e8" diff --git a/Resources/Prototypes/SS220/Roles/Jobs/CentComm/deathsquad.yml b/Resources/Prototypes/SS220/Roles/Jobs/CentComm/deathsquad.yml index 4db6186cc7efe7..aab133e52cfc9c 100644 --- a/Resources/Prototypes/SS220/Roles/Jobs/CentComm/deathsquad.yml +++ b/Resources/Prototypes/SS220/Roles/Jobs/CentComm/deathsquad.yml @@ -1,6 +1,6 @@ - type: job id: DeathsquadCommander - name: командир Эскадрона Смерти + name: job-name-dq-сommander description: job-description-deathsquad playTimeTracker: JobDeathSquadCommander setPreference: false @@ -15,7 +15,7 @@ - type: job id: DeathsquadHealer - name: специалист Эскадрона Смерти + name: job-name-dq-specialist description: job-description-deathsquad playTimeTracker: JobDeathSquadHealer setPreference: false From 1da86a7b3391ed09d2e7c6722821b2333207e7ab Mon Sep 17 00:00:00 2001 From: EstKemran Date: Sun, 20 Oct 2024 15:58:49 +0300 Subject: [PATCH 16/47] fix --- Resources/Locale/ru-RU/ss220/job/job-name.ftl | 4 ++-- .../SS220/Entities/Clothing/OuterClothing/hardsuits.yml | 1 + Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml | 3 +++ Resources/Prototypes/SS220/Roles/Jobs/CentComm/deathsquad.yml | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/ru-RU/ss220/job/job-name.ftl b/Resources/Locale/ru-RU/ss220/job/job-name.ftl index c3b851c4e4f929..5ba3e6c273e6fd 100644 --- a/Resources/Locale/ru-RU/ss220/job/job-name.ftl +++ b/Resources/Locale/ru-RU/ss220/job/job-name.ftl @@ -14,5 +14,5 @@ job-name-nt-admiral = адмирал NanoTrasen job-name-nt-politician = дипломат NanoTrasen job-name-ussp = СССП -job-name-dq-сommander = командир Эксадрона Смерти -job-name-dq-specialist = специалист Эксадрона Смерти +job-name-dq-commander = командир Эскадрона Смерти +job-name-dq-specialist = специалист Эскадрона Смерти diff --git a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml index 80f83a12be5c0f..0ca8be99965012 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml @@ -82,6 +82,7 @@ coefficient: 0.001 - type: Armor modifiers: + coefficients: Blunt: 0.2 Slash: 0.2 Piercing: 0.2 diff --git a/Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml index 58855681c4be5e..da28f41fd226fc 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml @@ -83,6 +83,7 @@ Brute: -1 Burn: -1 Toxin: -1 + Airloss: -0.5 - type: randomHumanoidSettings id: DeathSquadHealerRandom @@ -109,6 +110,7 @@ Brute: -0.8 Burn: -0.8 Toxin: -0.8 + Airloss: -0.4 - type: randomHumanoidSettings id: DeathSquadOperativeRandom @@ -132,6 +134,7 @@ Brute: -0.6 Burn: -0.6 Toxin: -0.6 + Airloss: -0.3 - type: entity name: commander of the Death Squadron diff --git a/Resources/Prototypes/SS220/Roles/Jobs/CentComm/deathsquad.yml b/Resources/Prototypes/SS220/Roles/Jobs/CentComm/deathsquad.yml index aab133e52cfc9c..7f00fafb1e70f7 100644 --- a/Resources/Prototypes/SS220/Roles/Jobs/CentComm/deathsquad.yml +++ b/Resources/Prototypes/SS220/Roles/Jobs/CentComm/deathsquad.yml @@ -1,6 +1,6 @@ - type: job id: DeathsquadCommander - name: job-name-dq-сommander + name: job-name-dq-commander description: job-description-deathsquad playTimeTracker: JobDeathSquadCommander setPreference: false From a7f2ba3443ddd3d510ff49161dabf5bdee8c79bb Mon Sep 17 00:00:00 2001 From: EstKemran Date: Sun, 20 Oct 2024 16:51:24 +0300 Subject: [PATCH 17/47] fix --- .../entities/mobs/player/humanoid.ftl | 3 +++ .../entities/objects/weapons/gun/battery.ftl | 2 +- .../Entities/Clothing/Head/hardsuit-helmets.yml | 2 +- .../Entities/Objects/Weapons/Melee/sword.yml | 1 - .../Melee/chainsword.rsi/inhand-right.png | Bin 759 -> 767 bytes 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/mobs/player/humanoid.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/mobs/player/humanoid.ftl index 5257fe2f7d586c..7cbb3260f4b8b5 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/entities/mobs/player/humanoid.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/mobs/player/humanoid.ftl @@ -1,6 +1,9 @@ ent-MobHumanDeathSquadLeader = командир Эскадрона Смерти .suffix = Роль ЭС, Эскадрон Смерти, Death Squad, ЭС, DQ + .desc = Командир элитного отряда Эскадрона Смерти. Руководите жизнью тех, кто будет обеспечивать аннигиляцию всех живых существ. ent-MobHumanDeathSquadHealer = специалист Эскадрона Смерти .suffix = Роль ЭС, Эскадрон Смерти, Death Squad, ЭС, DQ + .desc = Специалист элитного отряда Эскадрона Смерти. Поддерживайте жизнь тех, кто будет обеспечивать аннигиляцию всех живых существ. ent-MobHumanDeathSquadOperative = оперативник Эскадрона Смерти .suffix = Роль ЭС, Эскадрон Смерти, Death Squad, ЭС, DQ + .desc = Оперативник элитного отряда Эскадрона Смерти. Обеспечьте аннигиляцию всех живых существ. diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl index cea51b2f89145d..1f56e71525b65e 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl @@ -1,7 +1,7 @@ ent-WeaponPulseRifle2 = пульсовая винтовака .suffix = Винтовка, Эскадрон Смерти, Death Squad, ЭС, DQ .desc = Энергетическая винтовка тяжелого типа, способна разрушать структуры. -ent-ClothingHeadHelmetHardsuitDeathsquadAlpha = пульсовый дробовик +ent-WeaponPulseShotgun = пульсовый дробовик .suffix = Дробовик, Эскадрон Смерти, Death Squad, ЭС, DQ .desc = Энергетическая дробовик с новейшей техников лечения. diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/SS220/Entities/Clothing/Head/hardsuit-helmets.yml index c5453b2f77609f..cee155dabf9f76 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Head/hardsuit-helmets.yml @@ -121,4 +121,4 @@ radius: 6 - type: PressureProtection highPressureMultiplier: 0.32 - lowPressureMultiplier: + lowPressureMultiplier: 1000 diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml index 387a8fe94d039a..4fcd96d241ae11 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml @@ -126,7 +126,6 @@ state: icon - type: MeleeWeapon autoAttack: true - angle: 0 wideAnimationRotation: -135 attackRate: 4 damage: diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/chainsword.rsi/inhand-right.png b/Resources/Textures/SS220/Objects/Weapons/Melee/chainsword.rsi/inhand-right.png index f4c8206d90dd32ebdd6e3513e43f2ed7b89dbf22..063cdae262ff8aac6ef84877d32b676d3d491e7b 100644 GIT binary patch delta 730 zcmV<00ww+T1^)$*F@L#9L_t(|obBB)Yui8=2H@AVNMi^oHx>#yI;o^>1TBVAftD_w z;>DXcFWK@p`V%^K=;SWlIu}w5fkLx&=paLvlz@pSn3|gFBo`}EB_+B$M|q#s#_##N zvoO9-XMl)^h=_=Yh=_=?JbkjSnwaktJs}jHnmxFSIKI%4Uw=q<{++xB`h%g8u2enY zVDEf^0})|7g0WR#D!-NYfOMrgZ13Q7zQkl}4!;}V!~1u+&#zlLKbl5bvNJydq3~3% z?W~1I(?~~trgXmF4WKLkQUOBYsh%(so+X{HyZCDbFdd#|qxh==+_srdI5xu*HjD4v z)|tOF2x>B_%!=wtO&sR zBxL0mHc4H_YRS1$VctPcH~>6lvIu@Rz~tl@dHGrkP<9YH6-|PX0&Mb1Fj9b`L72$S zn*^g5q=a;(a^r2|7ewISh1rd_AznQ<9lt&hd+9_(L_|bHL_|bXmz#E*eXZN$01(F) zR*O(IUw_Nb($bY`clRE|kKa~)`mT~+`wAG3pbkWYz4HZn!hz}g0juU~n;n~5<5lu& zUjd0|8nq@{bDYkXIBf42?-cR70m|fS-5cD*y+HN{us?wP0qhT8e*pUfh=_=Yh=_=Y zh={0~PtljILaW0|*2v0x%1A|fIpA|j&Q=5p?E8}k7GuOB@TEkZQ^B!tnv zHd1Q|ZjzrnJ$@4}o&xbSZb+>qkj@7He1H33qx+ExoQ{U;=3AL_KRtr^`~~>=<1xCe zCf=-mJ6&IJoqVeWXUmGl17$^@wU|cpK?Da7@KSN%=)drL;!lt5|;G_ZDJQAEVpr{BJ*?Bj? z=>sXDeQo^tzVinn@bAIw&-bBTK64$vS%_RZ5fKp)5fKp)5tVTpx6qfK9`CffMsnKO zR(|2n(trQ&-*-8==_;S+2jpFFwSQkaKXU{`DiHnS)A?bqZ!L@G2S|pe@%#XuAHeei zcz%FH4V$ge!@ExAR$ zj{M3;XvEXFG1*(-VzI(;^T7Fu5n->7D*3hS9ZTNEJ;7!3YiYnX?+!2eUah;wcX1@t z+JIdg30BSz*u{}xh4!`BOH#7VFj9fsx`U(;v2ZH(7eYM3ci8U9VgLXD07*qoM6N<$ Ef+ZwhHvj+t From 5c18e25bb8f1616e13021a6c30a8c1932df6e842 Mon Sep 17 00:00:00 2001 From: EstKemran Date: Sun, 20 Oct 2024 17:46:28 +0300 Subject: [PATCH 18/47] fix --- .../prototypes/catalog/fills/backpacks.ftl | 4 ++ .../ss220/reagents/meta/physical-desc.ftl | 2 + .../Catalog/Fills/Backpacks/backpack.yml | 48 +++++++++++++++++ .../SS220/Catalog/Fills/Lockers/centcom.yml | 49 ++++++++++++++++++ .../SS220/Entities/Mobs/Player/humanoid.yml | 3 -- .../Structures/Storage/Lockers/locker.yml | 20 +++++++ .../Prototypes/SS220/Reagents/medicine.yml | 3 +- .../Textures/SS220/Interface/deathsquad.png | Bin 0 -> 378 bytes .../closet.rsi/deathsquadcommander_door.png | Bin 0 -> 480 bytes .../closet.rsi/deathsquadspecialist_door.png | Bin 0 -> 481 bytes .../Structures/Storage/closet.rsi/meta.json | 6 +++ 11 files changed, 131 insertions(+), 4 deletions(-) create mode 100644 Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/backpacks.ftl create mode 100644 Resources/Prototypes/SS220/Catalog/Fills/Lockers/centcom.yml create mode 100644 Resources/Textures/SS220/Interface/deathsquad.png create mode 100644 Resources/Textures/SS220/Structures/Storage/closet.rsi/deathsquadcommander_door.png create mode 100644 Resources/Textures/SS220/Structures/Storage/closet.rsi/deathsquadspecialist_door.png diff --git a/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/backpacks.ftl b/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/backpacks.ftl new file mode 100644 index 00000000000000..ce175f9c6ea63a --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/backpacks.ftl @@ -0,0 +1,4 @@ +ent-ClothingBackpackDeathSquadOperativeFilled = { ent-ClothingBackpackDeathSquadFilled } + .desc = { ent-ClothingBackpackDeathSquadFilled.desc } +ent-ClothingBackpackDeathSquadSpecialistFilled = { ent-ClothingBackpackDeathSquadFilled } + .desc = { ent-ClothingBackpackDeathSquadFilled.desc } diff --git a/Resources/Locale/ru-RU/ss220/reagents/meta/physical-desc.ftl b/Resources/Locale/ru-RU/ss220/reagents/meta/physical-desc.ftl index 40599a144804a6..50fea4ac9e7c5d 100644 --- a/Resources/Locale/ru-RU/ss220/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/ru-RU/ss220/reagents/meta/physical-desc.ftl @@ -1 +1,3 @@ reagent-physical-desc-piquant = пряное + +reagent-physical-desc-holymoly = невозможное diff --git a/Resources/Prototypes/SS220/Catalog/Fills/Backpacks/backpack.yml b/Resources/Prototypes/SS220/Catalog/Fills/Backpacks/backpack.yml index 4ec7264788ea9d..13d769e5392c8f 100644 --- a/Resources/Prototypes/SS220/Catalog/Fills/Backpacks/backpack.yml +++ b/Resources/Prototypes/SS220/Catalog/Fills/Backpacks/backpack.yml @@ -90,3 +90,51 @@ - id: Soap - id: CrowbarRed - id: AdvMopItem + +- type: entity + parent: ClothingBackpackERTSecurity + id: ClothingBackpackDeathSquadOperativeFilled + name: death squad backpack + description: Holds the kit of CentComm's most feared agents. + components: + - type: Sprite + sprite: Corvax/Back/Backpacks/deathsquad-backpack.rsi + - type: Storage + grid: + - 0,0,8,6 + - type: StorageFill + contents: + - id: WeaponPulseRifle2 + - id: WeaponPulsePistol + - id: WeaponRevolverMateba + - id: SpeedLoaderMagnumAP + - id: SpeedLoaderMagnumAP + - id: ToolDebug + - id: WelderExperimental + - id: PinpointerNuclear + - id: EmergencyMedipenDQ + amount: 2 + +- type: entity + parent: ClothingBackpackERTSecurity + id: ClothingBackpackDeathSquadSpecialistFilled + name: death squad backpack + description: Holds the kit of CentComm's most feared agents. + components: + - type: Sprite + sprite: Corvax/Back/Backpacks/deathsquad-backpack.rsi + - type: Storage + grid: + - 0,0,8,6 + - type: StorageFill + contents: + - id: WeaponPulseRifle2 + - id: WeaponPulsePistol + - id: WeaponRevolverMateba + - id: SpeedLoaderMagnumAP + - id: SpeedLoaderMagnumAP + - id: ToolDebug + - id: WelderExperimental + - id: PinpointerNuclear + - id: EmergencyMedipenDQ + amount: 6 diff --git a/Resources/Prototypes/SS220/Catalog/Fills/Lockers/centcom.yml b/Resources/Prototypes/SS220/Catalog/Fills/Lockers/centcom.yml new file mode 100644 index 00000000000000..96539bec3a071e --- /dev/null +++ b/Resources/Prototypes/SS220/Catalog/Fills/Lockers/centcom.yml @@ -0,0 +1,49 @@ +- type: entity + id: LockerDeathsquadOperativeFilled + suffix: Filled + parent: LockerDeathsquad + components: + - type: StorageFill + contents: + - id: FlashlightSeclite + - id: ClothingEyesHudOmniversal + - id: ClothingMaskGasDeathSquad + - id: ClothingHandsGlovesDQ + - id: ClothingShoesBootsMagDQ + - id: ClothingHeadsetAltCentComm + - id: ClothingBackpackDeathSquadOperativeFilled + +- type: entity + id: LockerDeathsquadCommanderFilled + suffix: Filled + parent: LockerDeathsquadCommander + components: + - type: StorageFill + contents: + - id: FlashlightSeclite + - id: ClothingEyesHudOmniversal + - id: ClothingMaskGasDeathSquad + - id: ClothingHandsGlovesDQ + - id: ClothingShoesBootsMagDQ + - id: ClothingHeadsetAltCentComm + - id: WeaponRifleSP + - id: Chainsword + - id: ClothingOuterHardsuitDeathsquadCommand + - id: ClothingBackpackDeathSquadOperativeFilled + +- type: entity + id: LockerDeathsquadSpecialistFilled + suffix: Filled + parent: LockerDeathsquadSpecialist + components: + - type: StorageFill + contents: + - id: FlashlightSeclite + - id: ClothingEyesHudOmniversal + - id: ClothingMaskGasDeathSquad + - id: ClothingHandsGlovesDQ + - id: ClothingShoesBootsMagDQ + - id: ClothingHeadsetAltCentComm + - id: WeaponPulseShotgun + - id: ClothingOuterHardsuitDeathsquadAlpha + - id: ClothingBackpackDeathSquadSpecialistFilled diff --git a/Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml index da28f41fd226fc..dbd66639dca35c 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml @@ -195,7 +195,6 @@ equipment: jumpsuit: ClothingUniformJumpsuitDeathSquad id: DeathsquadCommanderPDA - ears: ClothingHeadsetAltCentCom pocket1: DoorRemoteCommand - type: startingGear @@ -203,11 +202,9 @@ equipment: jumpsuit: ClothingUniformJumpsuitDeathSquad id: DeathsquadHealerPDA - ears: ClothingHeadsetAltCentCom - type: startingGear id: DeathSquadOperativeGear equipment: jumpsuit: ClothingUniformJumpsuitDeathSquad id: DeathsquadPDA - ears: ClothingHeadsetAltCentCom diff --git a/Resources/Prototypes/SS220/Entities/Structures/Storage/Lockers/locker.yml b/Resources/Prototypes/SS220/Entities/Structures/Storage/Lockers/locker.yml index d4d4a149741336..1cddaec1595e30 100644 --- a/Resources/Prototypes/SS220/Entities/Structures/Storage/Lockers/locker.yml +++ b/Resources/Prototypes/SS220/Entities/Structures/Storage/Lockers/locker.yml @@ -118,6 +118,26 @@ - type: AccessReader access: [ [ "CentralCommandDeathSquad" ] ] +- type: entity + id: LockerDeathsquadCommander + parent: LockerDeathsquad + name: шкаф командира Эскадрона Смерти + components: + - type: EntityStorageVisuals + stateBaseClosed: deathsquad + stateDoorOpen: medsteel_open + stateDoorClosed: deathsquadcommander_door + +- type: entity + id: LockerDeathsquadSpecialist + parent: LockerDeathsquad + name: шкаф специалиста Эскадрона Смерти + components: + - type: EntityStorageVisuals + stateBaseClosed: deathsquad + stateDoorOpen: medsteel_open + stateDoorClosed: deathsquadspecialist_door + #Командование - type: entity id: LockerBlueshield diff --git a/Resources/Prototypes/SS220/Reagents/medicine.yml b/Resources/Prototypes/SS220/Reagents/medicine.yml index 420e38236ab273..26b7ae22fe45c0 100644 --- a/Resources/Prototypes/SS220/Reagents/medicine.yml +++ b/Resources/Prototypes/SS220/Reagents/medicine.yml @@ -165,12 +165,13 @@ name: the essence of holy water group: Medicine desc: Concentrated holy water that cures all diseases and even death. - physicalDesc: невозможное + physicalDesc: reagent-physical-desc-holymoly flavor: HolyMoly color: "#e8e8e8" metabolisms: Medicine: effects: + - !type:HealthChange damage: groups: Brute: -10 diff --git a/Resources/Textures/SS220/Interface/deathsquad.png b/Resources/Textures/SS220/Interface/deathsquad.png new file mode 100644 index 0000000000000000000000000000000000000000..7f03a7ba03fe75232ea3ff774613a80fb1aae603 GIT binary patch literal 378 zcmV-=0fqjFP)UW z&vAJ9AenB~3uvuL+G+JboTSbHrd0s|;LFw3`S-WiQGU~^0AH@~^!RX9(*ihuAN>IA zcP;k2c2KujFUX$%I)Z0*N6L8v_&j})a$W%9B!xMj5GU!MamjfH0DzzSEh*;>z-7z; z!2w3!hC_G3*a%*M86Y?Sxe29|$g+&2HO7!1rBnb`*R}2Yo+OT<2vt=L{tE$sh5nxZ Y0`zE1q{zcZ-v9sr07*qoM6N<$g4z0*JOBUy literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Structures/Storage/closet.rsi/deathsquadcommander_door.png b/Resources/Textures/SS220/Structures/Storage/closet.rsi/deathsquadcommander_door.png new file mode 100644 index 0000000000000000000000000000000000000000..e4cc6800a2e66b7b809fd85754b0871e1f0d79ff GIT binary patch literal 480 zcmV<60U!Q}P)Px$nn^@KR9J=WRliFDQ5^qV)Zo?-CtMhW&wdC^2@Zk~It4YfM@??kmP3DmZPw=6 z?h?3VARH2$OF|y{fx@w_^DBys=FL3F>90_QduQ>7Kak6eeT0MP=^6L7rk_PAG$3eN%} z@r1PY%Z*IH*e5Wntx0RY92MkE$hnQSRi$x37eW&7@>Ed(2Px$n@L1LR9J=WRnJQTK@|R0>d-9=)-Vi&u^)nTNbn#CVW*(}gQ!!t>XwK80=rqa zuHCx?-ZBst3G@&`E;>{oF0@csbSh{%#D-Jaz7a(Vzsu}-=f8rd6hKK{rA&@bXmB00`<02LQq8SFKth(+7tS XI@g`EsKvBK00000NkvXXu0mjfIqB5L literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/SS220/Structures/Storage/closet.rsi/meta.json index d9802fe3275b65..e22c3b42d2b206 100644 --- a/Resources/Textures/SS220/Structures/Storage/closet.rsi/meta.json +++ b/Resources/Textures/SS220/Structures/Storage/closet.rsi/meta.json @@ -271,6 +271,12 @@ { "name": "deathsquad_door" }, + { + "name": "deathsquadcommander_door" + }, + { + "name": "deathsquadspecialist_door" + }, { "name": "detective_wardrobe_door" }, From 7fc166f3f17f307d0c1380e16aa8293ec5ed2d4e Mon Sep 17 00:00:00 2001 From: EstKemran Date: Sun, 20 Oct 2024 18:22:38 +0300 Subject: [PATCH 19/47] fix --- .../Locale/ru-RU/ss220/prototypes/catalog/fills/backpacks.ftl | 2 ++ Resources/Prototypes/SS220/Catalog/Fills/Lockers/centcom.yml | 2 +- .../Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/backpacks.ftl b/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/backpacks.ftl index ce175f9c6ea63a..4f86db65a83161 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/backpacks.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/backpacks.ftl @@ -1,4 +1,6 @@ ent-ClothingBackpackDeathSquadOperativeFilled = { ent-ClothingBackpackDeathSquadFilled } .desc = { ent-ClothingBackpackDeathSquadFilled.desc } + .suffix = Рюкзак оперативника ЭС, Эскадрон Смерти, Death Squad, ЭС, DQ ent-ClothingBackpackDeathSquadSpecialistFilled = { ent-ClothingBackpackDeathSquadFilled } .desc = { ent-ClothingBackpackDeathSquadFilled.desc } + .suffix = Рюкзак специалиста ЭС, Эскадрон Смерти, Death Squad, ЭС, DQ diff --git a/Resources/Prototypes/SS220/Catalog/Fills/Lockers/centcom.yml b/Resources/Prototypes/SS220/Catalog/Fills/Lockers/centcom.yml index 96539bec3a071e..9219a9e37033a7 100644 --- a/Resources/Prototypes/SS220/Catalog/Fills/Lockers/centcom.yml +++ b/Resources/Prototypes/SS220/Catalog/Fills/Lockers/centcom.yml @@ -28,7 +28,7 @@ - id: ClothingHeadsetAltCentComm - id: WeaponRifleSP - id: Chainsword - - id: ClothingOuterHardsuitDeathsquadCommand + - id: ClothingOuterHardsuitDeathsquadCommander - id: ClothingBackpackDeathSquadOperativeFilled - type: entity diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 716298c6a47bfa..a2721e58511e57 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -241,6 +241,7 @@ Heat: -14 Radiation: 4 Poison: -8 + Asphyxiation: -50 - type: ProjectileSpread proto: BulletLaserHeal count: 3 From 9410f8a8eaa6f61fa824e72328e413b9d2b4e1df Mon Sep 17 00:00:00 2001 From: EstKemran Date: Sun, 20 Oct 2024 18:46:46 +0300 Subject: [PATCH 20/47] fix --- .../Entities/Clothing/OuterClothing/hardsuits.yml | 3 ++- .../SS220/Entities/Clothing/Shoes/boots.yml | 5 ----- .../Objects/Weapons/Guns/Battery/battery_guns.yml | 3 --- Resources/Prototypes/SS220/Reagents/medicine.yml | 4 ++-- Resources/Prototypes/SS220/ai_factions.yml | 14 ++++++++++++++ 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml index 0ca8be99965012..a4776b303f04a8 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml @@ -79,7 +79,8 @@ highPressureMultiplier: 0.02 lowPressureMultiplier: 1000 - type: TemperatureProtection - coefficient: 0.001 + heatingCoefficient: 0.001 + coolingCoefficient: 0.001 - type: Armor modifiers: coefficients: diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml index 52799f6207a3a8..99862e941c9c8c 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml @@ -77,8 +77,6 @@ state: icon - type: Clothing sprite: SS220/Clothing/Shoes/Boots/dq_magboots.rsi - - type: Magboots - toggleAction: ActionToggleMagbootsAdvanced - type: ClothingSpeedModifier walkModifier: 1 sprintModifier: 1 @@ -91,6 +89,3 @@ moles: - 1.153853429 # oxygen - 1.153853429 # nitrogen - - type: Item - sprite: null - size: Normal diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 5fdffe0db3cea2..30bb5f75b44508 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -9,9 +9,6 @@ components: - type: Gun fireRate: 2.5 - - type: HitscanBatteryAmmoProvider - proto: Pulse2 - fireCost: 100 - type: Battery maxCharge: 400 startingCharge: 400 diff --git a/Resources/Prototypes/SS220/Reagents/medicine.yml b/Resources/Prototypes/SS220/Reagents/medicine.yml index 26b7ae22fe45c0..6618953d89542a 100644 --- a/Resources/Prototypes/SS220/Reagents/medicine.yml +++ b/Resources/Prototypes/SS220/Reagents/medicine.yml @@ -162,9 +162,9 @@ - type: reagent id: HolyMolyWater - name: the essence of holy water + name: reagent-name-holymolywater group: Medicine - desc: Concentrated holy water that cures all diseases and even death. + desc: reagent-desc-holymolywater physicalDesc: reagent-physical-desc-holymoly flavor: HolyMoly color: "#e8e8e8" diff --git a/Resources/Prototypes/SS220/ai_factions.yml b/Resources/Prototypes/SS220/ai_factions.yml index b339f2c499a738..68b64a8ddd1bea 100644 --- a/Resources/Prototypes/SS220/ai_factions.yml +++ b/Resources/Prototypes/SS220/ai_factions.yml @@ -55,3 +55,17 @@ - Revolutionary # ss220 spider queen end + +# Death Squad +- type: npcFaction + id: DeathSquad + - NanoTrasen + - Syndicate + - Xeno + - Passive + - PetsNT + - Mouse + - Zombie + - Revolutionary + - SpiderQueen + - SimpleHostile From daf88f31e4279db94648feb119b16bdc262b3e77 Mon Sep 17 00:00:00 2001 From: EstKemran Date: Sun, 20 Oct 2024 19:04:58 +0300 Subject: [PATCH 21/47] fix --- Resources/Prototypes/SS220/ai_factions.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/SS220/ai_factions.yml b/Resources/Prototypes/SS220/ai_factions.yml index 68b64a8ddd1bea..3d7f6e58b90343 100644 --- a/Resources/Prototypes/SS220/ai_factions.yml +++ b/Resources/Prototypes/SS220/ai_factions.yml @@ -59,6 +59,7 @@ # Death Squad - type: npcFaction id: DeathSquad + hostile: - NanoTrasen - Syndicate - Xeno From 3fe67d17a9b9b2f5960ad75d6bee31074c34c001 Mon Sep 17 00:00:00 2001 From: EstKemran Date: Sun, 20 Oct 2024 19:26:42 +0300 Subject: [PATCH 22/47] fix --- .../SS220/Entities/Clothing/OuterClothing/hardsuits.yml | 3 ++- .../Prototypes/SS220/Entities/Clothing/Shoes/boots.yml | 1 - .../SS220/Entities/Objects/Misc/identification_cards.yml | 8 +++----- .../SS220/Entities/Objects/Weapons/Melee/sword.yml | 1 - 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml index a4776b303f04a8..8afaafcd5fb781 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml @@ -128,7 +128,8 @@ highPressureMultiplier: 0.02 lowPressureMultiplier: 1000 - type: TemperatureProtection - coefficient: 0.001 + heatingCoefficient: 0.001 + coolingCoefficient: 0.001 - type: ExplosionResistance damageCoefficient: 0.4 - type: Armor diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml index 99862e941c9c8c..22cf4a97ad4450 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml @@ -80,7 +80,6 @@ - type: ClothingSpeedModifier walkModifier: 1 sprintModifier: 1 - enabled: false - type: GasTank outputPressure: 42.6 air: diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml index f6e85591fb1d30..06e6ce4fe256c2 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml @@ -182,8 +182,7 @@ layers: - state: deathsquad - type: IdCard - jobTitle: Эскадрон Смерти - fullName: Командир + jobTitle: job-name-dq-commander - type: PresetIdCard job: DeathsquadCommander @@ -196,7 +195,6 @@ layers: - state: deathsquad - type: IdCard - jobTitle: Эскадрон Смерти - fullName: Специалист + jobTitle: job-name-dq-specialist - type: PresetIdCard - job: DeathsquadHealer \ No newline at end of file + job: DeathsquadHealer diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml index 4fcd96d241ae11..5e78b0d98ea591 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml @@ -144,7 +144,6 @@ - type: DisarmMalus malus: 0 - type: Reflect - enabled: false #todo # - type: Clothing # sprite: SS220/Objects/Weapons/Melee/chainsword.rsi From bfce926dfc0fd3cbf46d65922ed6e9391034eb05 Mon Sep 17 00:00:00 2001 From: EstKemran Date: Sun, 20 Oct 2024 19:47:25 +0300 Subject: [PATCH 23/47] fix --- Resources/Locale/ru-RU/ss220/job/job-name.ftl | 1 + .../SS220/Entities/Objects/Misc/identification_cards.yml | 3 +-- Resources/Prototypes/SS220/StatusIcons/centcom.yml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Locale/ru-RU/ss220/job/job-name.ftl b/Resources/Locale/ru-RU/ss220/job/job-name.ftl index 5ba3e6c273e6fd..20c37b5b04da3f 100644 --- a/Resources/Locale/ru-RU/ss220/job/job-name.ftl +++ b/Resources/Locale/ru-RU/ss220/job/job-name.ftl @@ -14,5 +14,6 @@ job-name-nt-admiral = адмирал NanoTrasen job-name-nt-politician = дипломат NanoTrasen job-name-ussp = СССП +job-name-deathsquad = оперативник Эскадрона Смерти job-name-dq-commander = командир Эскадрона Смерти job-name-dq-specialist = специалист Эскадрона Смерти diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml index 06e6ce4fe256c2..f75e63d83cd44d 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml @@ -162,8 +162,7 @@ - type: Item heldPrefix: blue - type: IdCard - jobTitle: Эскадрон Смерти - fullName: Оперативник + jobTitle: job-name-deathsquad - type: Access groups: - AllAccess diff --git a/Resources/Prototypes/SS220/StatusIcons/centcom.yml b/Resources/Prototypes/SS220/StatusIcons/centcom.yml index af4582aa64877d..9d0f260c5aae5e 100644 --- a/Resources/Prototypes/SS220/StatusIcons/centcom.yml +++ b/Resources/Prototypes/SS220/StatusIcons/centcom.yml @@ -4,7 +4,7 @@ icon: sprite: /Textures/SS220/Interface/Misc/job_icons.rsi state: deathsquad - jobName: job-name-deathsquade + jobName: job-name-deathsquad - type: jobIcon parent: JobIcon @@ -12,7 +12,7 @@ icon: sprite: /Textures/SS220/Interface/Misc/job_icons.rsi state: deathsquadleader - jobName: job-name-deathsquadecommander + jobName: job-name-dq-commander - type: jobIcon parent: JobIcon @@ -20,4 +20,4 @@ icon: sprite: /Textures/SS220/Interface/Misc/job_icons.rsi state: deathsquadalpha - jobName: job-name-deathsquadehealer + jobName: job-name-dq-specialist From 1911c35993b8e8de8c56e13ae655ee204f4723be Mon Sep 17 00:00:00 2001 From: EstKemran Date: Sun, 20 Oct 2024 21:13:54 +0300 Subject: [PATCH 24/47] fix --- .../Weapons/Guns/Battery/battery_guns.yml | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 30bb5f75b44508..1332f1ed50c14e 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -2,11 +2,21 @@ # Death Squad - type: entity name: pulse rifle - parent: WeaponPulseRifle + parent: BaseWeaponBattery id: WeaponPulseRifle2 description: A heavy-duty energy rifle capable of destroying structures. suffix: Винтовка, Death Squad components: + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/pulse_rifle.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: Objects/Weapons/Guns/Battery/pulse_rifle.rsi - type: Gun fireRate: 2.5 - type: Battery @@ -24,7 +34,7 @@ - type: entity name: pulse shotgun - parent: WeaponPulseRifle + parent: BaseWeaponBattery id: WeaponPulseShotgun description: An energy shotgun with the latest treatment technique. suffix: Death Squad @@ -40,17 +50,17 @@ - type: Clothing sprite: SS220/Objects/Weapons/Guns/pulse_shotgun.rsi - type: Battery - maxCharge: 40 - startingCharge: 40 + maxCharge: 400 + startingCharge: 400 - type: BatteryWeaponFireModes fireModes: - proto: BulletLaserDestroy name: firemode-name-kill - fireCost: 1 + fireCost: 10 soundGunshot: /Audio/Weapons/Guns/Gunshots/taser2.ogg magState: mag - proto: BulletLaserHeal name: firemode-name-heal - fireCost: 1.75 + fireCost: 17.5 soundGunshot: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg magState: heal-mag From eb9a64c56c449cd8195cbe92d7b8ca203a248678 Mon Sep 17 00:00:00 2001 From: EstKemran Date: Sun, 20 Oct 2024 21:40:01 +0300 Subject: [PATCH 25/47] fix --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 1332f1ed50c14e..6cccac59d7ae05 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -22,6 +22,8 @@ - type: Battery maxCharge: 400 startingCharge: 400 + - type: ProjectileBatteryAmmoProvider + proto: Pulsekill - type: BatteryWeaponFireModes fireModes: - proto: Pulsekill @@ -52,6 +54,8 @@ - type: Battery maxCharge: 400 startingCharge: 400 + - type: ProjectileBatteryAmmoProvider + proto: BulletLaserDestroy - type: BatteryWeaponFireModes fireModes: - proto: BulletLaserDestroy From 31342de76e6c24013b217d338075638822ba75c6 Mon Sep 17 00:00:00 2001 From: EstKemran Date: Sun, 20 Oct 2024 21:47:12 +0300 Subject: [PATCH 26/47] fix --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 6cccac59d7ae05..ca35df7c93bf94 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -22,7 +22,7 @@ - type: Battery maxCharge: 400 startingCharge: 400 - - type: ProjectileBatteryAmmoProvider + - type: HitscanBatteryAmmoProvider proto: Pulsekill - type: BatteryWeaponFireModes fireModes: From 2e74cec32fa861beca09f5cf6c8033b3c403bd64 Mon Sep 17 00:00:00 2001 From: EstKemran Date: Sun, 20 Oct 2024 22:13:37 +0300 Subject: [PATCH 27/47] fiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiix --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index ca35df7c93bf94..9c3ccbecd6703b 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -24,6 +24,7 @@ startingCharge: 400 - type: HitscanBatteryAmmoProvider proto: Pulsekill + fireCost: 1 - type: BatteryWeaponFireModes fireModes: - proto: Pulsekill @@ -56,6 +57,7 @@ startingCharge: 400 - type: ProjectileBatteryAmmoProvider proto: BulletLaserDestroy + fireCost: 10 - type: BatteryWeaponFireModes fireModes: - proto: BulletLaserDestroy From 954e3e9d9c12819c5d56eeb32fa0fa4729e03458 Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Mon, 21 Oct 2024 20:07:28 +0300 Subject: [PATCH 28/47] Update Resources/Locale/ru-RU/ss220/clothing/Hands/gloves.ftl Co-authored-by: Ady4ik <141335742+Ady4ik@users.noreply.github.com> --- Resources/Locale/ru-RU/ss220/clothing/Hands/gloves.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ss220/clothing/Hands/gloves.ftl b/Resources/Locale/ru-RU/ss220/clothing/Hands/gloves.ftl index 081d7c2cd097fe..463ce3b1111f42 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/Hands/gloves.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/Hands/gloves.ftl @@ -8,4 +8,4 @@ ent-ClothingHandsGlovesJanitorJR = черные резиновые перчат ent-ClothingHandsGlovesDQ = боевые перчатки Эскадрона Смерти .suffix = Эскадрон Смерти, Death Squad, ЭС, DQ - .desc = Силовые перчатки, многократно усиливающие механическую силу удара. + .desc = Силовые перчатки, значительно усиливающие силу удара. From 5a7d65d814bea63271de678f875a110956e6b6eb Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Mon, 21 Oct 2024 20:08:05 +0300 Subject: [PATCH 29/47] Update Resources/Locale/ru-RU/ss220/clothing/Shoes/boots.ftl Co-authored-by: Ady4ik <141335742+Ady4ik@users.noreply.github.com> --- Resources/Locale/ru-RU/ss220/clothing/Shoes/boots.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ss220/clothing/Shoes/boots.ftl b/Resources/Locale/ru-RU/ss220/clothing/Shoes/boots.ftl index 9f2f6f4c6d0ea4..57e39c36198646 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/Shoes/boots.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/Shoes/boots.ftl @@ -1,3 +1,3 @@ ent-ClothingShoesBootsMagDQ = магнитные ботинки Эскадрона Смерти .suffix = Эскадрон Смерти, Death Squad, ЭС, DQ - .desc = Самые современные магнитные ботинки в узнаваемых цветах. + .desc = Самые современные магнитные ботинки в незабываемых цветах. From 5c265d53fd9b61dbe13acbf28365fda5bf1101a3 Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Mon, 21 Oct 2024 20:08:23 +0300 Subject: [PATCH 30/47] Update Resources/Locale/ru-RU/ss220/job/job-name.ftl Co-authored-by: Ady4ik <141335742+Ady4ik@users.noreply.github.com> --- Resources/Locale/ru-RU/ss220/job/job-name.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ss220/job/job-name.ftl b/Resources/Locale/ru-RU/ss220/job/job-name.ftl index 20c37b5b04da3f..62fc256583b30e 100644 --- a/Resources/Locale/ru-RU/ss220/job/job-name.ftl +++ b/Resources/Locale/ru-RU/ss220/job/job-name.ftl @@ -14,6 +14,6 @@ job-name-nt-admiral = адмирал NanoTrasen job-name-nt-politician = дипломат NanoTrasen job-name-ussp = СССП -job-name-deathsquad = оперативник Эскадрона Смерти +job-name-dq-operative = оперативник Эскадрона Смерти job-name-dq-commander = командир Эскадрона Смерти job-name-dq-specialist = специалист Эскадрона Смерти From 21c348efff0be1d1ad988665ba45cabe193a2754 Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Mon, 21 Oct 2024 20:08:34 +0300 Subject: [PATCH 31/47] Update Resources/Locale/ru-RU/ss220/prototypes/entities/objects/specific/medical/hypospray.ftl Co-authored-by: Ady4ik <141335742+Ady4ik@users.noreply.github.com> --- .../prototypes/entities/objects/specific/medical/hypospray.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/specific/medical/hypospray.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/specific/medical/hypospray.ftl index e1da00a02d7e22..e3e8c12e162d78 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/specific/medical/hypospray.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/specific/medical/hypospray.ftl @@ -1,3 +1,3 @@ ent-EmergencyMedipenDQ = божественный медипен .suffix = Эскадрон Смерти, Death Squad, ЭС, DQ - .desc = Экстренный медипен, который в кратчайшие сроки ставит на ноги даже при самых тяжелых травмах. Из-за дороговизны и трудности производства применяется элитными отрядами. + .desc = Экстренный медипен, который в кратчайшие сроки ставит на ноги даже при самых тяжелых травмах. Из-за дороговизны производства применяется только элитными отрядами. From 2771cc05545cf4e638c1386d6b924b736f1cde4f Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Mon, 21 Oct 2024 20:09:36 +0300 Subject: [PATCH 32/47] Update Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml Co-authored-by: Ady4ik <141335742+Ady4ik@users.noreply.github.com> --- .../SS220/Entities/Objects/Misc/identification_cards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml index f75e63d83cd44d..27de39e7fd5f9a 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml @@ -162,7 +162,7 @@ - type: Item heldPrefix: blue - type: IdCard - jobTitle: job-name-deathsquad + jobTitle: job-name-dq-operative - type: Access groups: - AllAccess From 9c27d9e2f1c1e0ef2be716e9e61bac2f73e4a3af Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Mon, 21 Oct 2024 20:11:51 +0300 Subject: [PATCH 33/47] Update Resources/Prototypes/SS220/StatusIcons/centcom.yml Co-authored-by: Ady4ik <141335742+Ady4ik@users.noreply.github.com> --- Resources/Prototypes/SS220/StatusIcons/centcom.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/SS220/StatusIcons/centcom.yml b/Resources/Prototypes/SS220/StatusIcons/centcom.yml index 9d0f260c5aae5e..437614fd2f9c3f 100644 --- a/Resources/Prototypes/SS220/StatusIcons/centcom.yml +++ b/Resources/Prototypes/SS220/StatusIcons/centcom.yml @@ -4,7 +4,7 @@ icon: sprite: /Textures/SS220/Interface/Misc/job_icons.rsi state: deathsquad - jobName: job-name-deathsquad + jobName: job-name-dq-operative - type: jobIcon parent: JobIcon From fac9c423fa838897d1d48e87fa79f2358815b98d Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Mon, 21 Oct 2024 20:12:22 +0300 Subject: [PATCH 34/47] Update Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl Co-authored-by: Svarshik <96281939+lexaSvarshik@users.noreply.github.com> --- .../ss220/prototypes/entities/objects/weapons/gun/battery.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl index 1f56e71525b65e..ea4ffd97765455 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl @@ -3,7 +3,7 @@ ent-WeaponPulseRifle2 = пульсовая винтовака .desc = Энергетическая винтовка тяжелого типа, способна разрушать структуры. ent-WeaponPulseShotgun = пульсовый дробовик .suffix = Дробовик, Эскадрон Смерти, Death Squad, ЭС, DQ - .desc = Энергетическая дробовик с новейшей техников лечения. + .desc = Энергетическая дробовик с новейшей технологией лечения. firemode-name-kill = режия для убийства firemode-name-destroy = режим для УНИЧТОЖЕНИЯ From 0e7b6714dd1f9338481f26ea01ffdba917697cd1 Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Mon, 21 Oct 2024 20:12:47 +0300 Subject: [PATCH 35/47] Update Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl Co-authored-by: Svarshik <96281939+lexaSvarshik@users.noreply.github.com> --- .../ss220/prototypes/entities/objects/weapons/gun/battery.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl index ea4ffd97765455..20bfa2f25bf4aa 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl @@ -1,6 +1,6 @@ ent-WeaponPulseRifle2 = пульсовая винтовака .suffix = Винтовка, Эскадрон Смерти, Death Squad, ЭС, DQ - .desc = Энергетическая винтовка тяжелого типа, способна разрушать структуры. + .desc = Энергетическая винтовка тяжелого типа, способна аннигилировать любые структуры. ent-WeaponPulseShotgun = пульсовый дробовик .suffix = Дробовик, Эскадрон Смерти, Death Squad, ЭС, DQ .desc = Энергетическая дробовик с новейшей технологией лечения. From 55218833654e31b23e65726921d6c8c760d015d0 Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Mon, 21 Oct 2024 20:13:37 +0300 Subject: [PATCH 36/47] Update Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml Co-authored-by: Svarshik <96281939+lexaSvarshik@users.noreply.github.com> --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 9c3ccbecd6703b..34b37a9a1929eb 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -39,7 +39,7 @@ name: pulse shotgun parent: BaseWeaponBattery id: WeaponPulseShotgun - description: An energy shotgun with the latest treatment technique. + description: An energy shotgun with the latest treatment technology. suffix: Death Squad components: - type: Sprite From 035b37040f9fe217560076372982b580e63720ab Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Mon, 21 Oct 2024 20:13:59 +0300 Subject: [PATCH 37/47] Update Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml Co-authored-by: Svarshik <96281939+lexaSvarshik@users.noreply.github.com> --- .../SS220/Entities/Clothing/OuterClothing/hardsuits.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml index 8afaafcd5fb781..836e81b95fcf0b 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml @@ -117,7 +117,7 @@ - type: entity parent: ClothingOuterHardsuitBase id: ClothingOuterHardsuitDeathsquadAlpha - name: the hardsuit of the specialist of the DQ + name: the hardsuit of the DQ specialist description: A high-tech hardsuit designed for the squad specialist. components: - type: Sprite From 61333d78d5267aa6b94f5a69b91c2c14214c8e2e Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Mon, 21 Oct 2024 20:14:16 +0300 Subject: [PATCH 38/47] Update Resources/Prototypes/SS220/Entities/Objects/Specific/Medical/hypospray.yml Co-authored-by: Svarshik <96281939+lexaSvarshik@users.noreply.github.com> --- .../SS220/Entities/Objects/Specific/Medical/hypospray.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/SS220/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/SS220/Entities/Objects/Specific/Medical/hypospray.yml index 029e3b20a945e4..751c4f33f7106c 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Specific/Medical/hypospray.yml @@ -2,7 +2,7 @@ parent: ChemicalMedipen id: EmergencyMedipenDQ name: holymoly medicine - description: Emergency honey and foam, which puts you back on your feet in the shortest possible time, even with the most severe injuries. Due to the high cost and difficulty of production, it is used by elite units. + description: Emergency medipen, which puts you back on your feet in the shortest possible time, even with the most severe injuries. Due to the high cost and difficulty of production, it is used only by the most elite units. suffix: Shitspawn, Death Squad components: - type: SolutionContainerManager From 545eaeb8b7cf93a2718061c4427c318df5c8a22d Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Mon, 21 Oct 2024 20:14:53 +0300 Subject: [PATCH 39/47] Update Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/SMGs/smgs.yml Co-authored-by: Svarshik <96281939+lexaSvarshik@users.noreply.github.com> --- .../SS220/Entities/Objects/Weapons/Guns/SMGs/smgs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index c6f19ffa08cae0..ce1d1947a857b2 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -2,7 +2,7 @@ parent: BaseWeaponSubMachineGun id: WeaponRifleSP name: SP-91-RC - description: A large submachine gun using caliber cartridges.45 magnum. + description: A large submachine gun using caliber cartridges .45 magnum. suffix: Death Squad components: - type: Sprite From 848a8ff1dca20359098cc4ee4ab13833d685425c Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Mon, 21 Oct 2024 20:15:38 +0300 Subject: [PATCH 40/47] Update Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml Co-authored-by: Svarshik <96281939+lexaSvarshik@users.noreply.github.com> --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 34b37a9a1929eb..20eb6c0e9dc286 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -4,7 +4,7 @@ name: pulse rifle parent: BaseWeaponBattery id: WeaponPulseRifle2 - description: A heavy-duty energy rifle capable of destroying structures. + description: A heavy-duty energy rifle capable of annihilating any structures. suffix: Винтовка, Death Squad components: - type: Sprite From df31bd0b08a694bb22a63c31270d34e6b0bc6961 Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Mon, 21 Oct 2024 20:16:08 +0300 Subject: [PATCH 41/47] Update Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml Co-authored-by: Svarshik <96281939+lexaSvarshik@users.noreply.github.com> --- .../SS220/Entities/Clothing/OuterClothing/hardsuits.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml index 836e81b95fcf0b..174a4e23f1a032 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml @@ -68,7 +68,7 @@ - type: entity parent: ClothingOuterHardsuitBase id: ClothingOuterHardsuitDeathsquadCommander - name: the hardsuit of the commander of the DQ + name: the hardsuit of the DQ commander description: A high-tech hardsuit designed for the squad commander. components: - type: Sprite From 0a5f18e2e437268e2650e44157f3d458e80b6e33 Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Mon, 21 Oct 2024 21:34:33 +0300 Subject: [PATCH 42/47] Update Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml Co-authored-by: Stalen <33173619+stalengd@users.noreply.github.com> --- Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml index da4a3cb6f34a2b..7a6efdb53ab64b 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml @@ -54,7 +54,6 @@ visible: false #SS220 PDA-Resprite-End - type: Icon state: pda-seniorservice - - type: entity parent: BasePDA id: MagistratePDA From 77d4a710792dad78121ac556c608d4bfece5160b Mon Sep 17 00:00:00 2001 From: EstKemran Date: Mon, 21 Oct 2024 21:40:52 +0300 Subject: [PATCH 43/47] reviev-update --- Resources/Locale/ru-RU/ss220/clothing/Hands/gloves.ftl | 2 +- Resources/Locale/ru-RU/ss220/clothing/Head/hardsuits.ftl | 4 ++-- .../Locale/ru-RU/ss220/clothing/OuterClothing/hardsuits.ftl | 4 ++-- Resources/Locale/ru-RU/ss220/clothing/Shoes/boots.ftl | 2 +- .../ru-RU/ss220/prototypes/catalog/fills/backpacks.ftl | 4 ++-- .../ss220/prototypes/entities/mobs/player/humanoid.ftl | 6 +++--- .../entities/objects/specific/medical/hypospray.ftl | 2 +- .../prototypes/entities/objects/weapons/gun/battery.ftl | 4 ++-- .../ss220/prototypes/entities/objects/weapons/gun/smg.ftl | 2 +- .../prototypes/entities/objects/weapons/gun/turret.ftl | 2 +- .../prototypes/entities/objects/weapons/melee/swords.ftl | 2 +- .../Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/meta.json | 2 +- .../Head/Hardsuits/dq_helmet_commander.rsi/meta.json | 2 +- .../OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/meta.json | 2 +- .../Hardsuits/dq_hardsuit_commander.rsi/meta.json | 2 +- 15 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Resources/Locale/ru-RU/ss220/clothing/Hands/gloves.ftl b/Resources/Locale/ru-RU/ss220/clothing/Hands/gloves.ftl index 081d7c2cd097fe..2f65bbbdfa5f36 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/Hands/gloves.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/Hands/gloves.ftl @@ -7,5 +7,5 @@ ent-ClothingHandsGlovesJanitorJR = черные резиновые перчат .desc = Уборочные перчатки с дополнительным защитным покрытием. Они видели столь много... ent-ClothingHandsGlovesDQ = боевые перчатки Эскадрона Смерти - .suffix = Эскадрон Смерти, Death Squad, ЭС, DQ + .suffix = Эскадрон Смерти, dq .desc = Силовые перчатки, многократно усиливающие механическую силу удара. diff --git a/Resources/Locale/ru-RU/ss220/clothing/Head/hardsuits.ftl b/Resources/Locale/ru-RU/ss220/clothing/Head/hardsuits.ftl index cea4225935ad36..a9a9ac2a7b75ef 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/Head/hardsuits.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/Head/hardsuits.ftl @@ -1,6 +1,6 @@ ent-ClothingHeadHelmetHardsuitDeathsquadCommander = шлем командира Эскадрона Смерти - .suffix = Эскадрон Смерти, Death Squad, ЭС, DQ + .suffix = Эскадрон Смерти, dq .desc = Шлем от костюм командира Эскадрона Смерти. ent-ClothingHeadHelmetHardsuitDeathsquadAlpha = шлем специалиста Эскадрона Смерти - .suffix = Эскадрон Смерти, Death Squad, ЭС, DQ + .suffix = Эскадрон Смерти, dq .desc = Шлем от костюм специалиста Эскадрона Смерти. diff --git a/Resources/Locale/ru-RU/ss220/clothing/OuterClothing/hardsuits.ftl b/Resources/Locale/ru-RU/ss220/clothing/OuterClothing/hardsuits.ftl index 4abe34437899dc..94408072f47df3 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/OuterClothing/hardsuits.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/OuterClothing/hardsuits.ftl @@ -1,6 +1,6 @@ ent-ClothingOuterHardsuitDeathsquadCommander = скафандр командира Эскадрона Смерти - .suffix = Эскадрон Смерти, Death Squad, ЭС, DQ + .suffix = Эскадрон Смерти, dq .desc = Высокотехнологичный скафандр, предназначенный для командира отряда. ent-ClothingOuterHardsuitDeathsquadAlpha = скафандр специалиста Эскадрона Смерти - .suffix = Эскадрон Смерти, Death Squad, ЭС, DQ + .suffix = Эскадрон Смерти, dq .desc = Высокотехнологичный скафандр, предназначенный для специалистов отряда. diff --git a/Resources/Locale/ru-RU/ss220/clothing/Shoes/boots.ftl b/Resources/Locale/ru-RU/ss220/clothing/Shoes/boots.ftl index 9f2f6f4c6d0ea4..3d3ea213d77909 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/Shoes/boots.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/Shoes/boots.ftl @@ -1,3 +1,3 @@ ent-ClothingShoesBootsMagDQ = магнитные ботинки Эскадрона Смерти - .suffix = Эскадрон Смерти, Death Squad, ЭС, DQ + .suffix = Эскадрон Смерти, dq .desc = Самые современные магнитные ботинки в узнаваемых цветах. diff --git a/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/backpacks.ftl b/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/backpacks.ftl index 4f86db65a83161..295128917475e0 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/backpacks.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/backpacks.ftl @@ -1,6 +1,6 @@ ent-ClothingBackpackDeathSquadOperativeFilled = { ent-ClothingBackpackDeathSquadFilled } .desc = { ent-ClothingBackpackDeathSquadFilled.desc } - .suffix = Рюкзак оперативника ЭС, Эскадрон Смерти, Death Squad, ЭС, DQ + .suffix = Оперативник, Эскадрон Смерти, dq ent-ClothingBackpackDeathSquadSpecialistFilled = { ent-ClothingBackpackDeathSquadFilled } .desc = { ent-ClothingBackpackDeathSquadFilled.desc } - .suffix = Рюкзак специалиста ЭС, Эскадрон Смерти, Death Squad, ЭС, DQ + .suffix = Специалист, Эскадрон Смерти, dq diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/mobs/player/humanoid.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/mobs/player/humanoid.ftl index 7cbb3260f4b8b5..ededf42e18b3f5 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/entities/mobs/player/humanoid.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/mobs/player/humanoid.ftl @@ -1,9 +1,9 @@ ent-MobHumanDeathSquadLeader = командир Эскадрона Смерти - .suffix = Роль ЭС, Эскадрон Смерти, Death Squad, ЭС, DQ + .suffix = Роль ЭС, Эскадрон Смерти, dq .desc = Командир элитного отряда Эскадрона Смерти. Руководите жизнью тех, кто будет обеспечивать аннигиляцию всех живых существ. ent-MobHumanDeathSquadHealer = специалист Эскадрона Смерти - .suffix = Роль ЭС, Эскадрон Смерти, Death Squad, ЭС, DQ + .suffix = Роль ЭС, Эскадрон Смерти, dq .desc = Специалист элитного отряда Эскадрона Смерти. Поддерживайте жизнь тех, кто будет обеспечивать аннигиляцию всех живых существ. ent-MobHumanDeathSquadOperative = оперативник Эскадрона Смерти - .suffix = Роль ЭС, Эскадрон Смерти, Death Squad, ЭС, DQ + .suffix = Роль ЭС, Эскадрон Смерти, dq .desc = Оперативник элитного отряда Эскадрона Смерти. Обеспечьте аннигиляцию всех живых существ. diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/specific/medical/hypospray.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/specific/medical/hypospray.ftl index e1da00a02d7e22..ea2a399db22fd9 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/specific/medical/hypospray.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/specific/medical/hypospray.ftl @@ -1,3 +1,3 @@ ent-EmergencyMedipenDQ = божественный медипен - .suffix = Эскадрон Смерти, Death Squad, ЭС, DQ + .suffix = Эскадрон Смерти, dq .desc = Экстренный медипен, который в кратчайшие сроки ставит на ноги даже при самых тяжелых травмах. Из-за дороговизны и трудности производства применяется элитными отрядами. diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl index 1f56e71525b65e..de57f0adae19f6 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl @@ -1,8 +1,8 @@ ent-WeaponPulseRifle2 = пульсовая винтовака - .suffix = Винтовка, Эскадрон Смерти, Death Squad, ЭС, DQ + .suffix = Винтовка, Эскадрон Смерти, dq .desc = Энергетическая винтовка тяжелого типа, способна разрушать структуры. ent-WeaponPulseShotgun = пульсовый дробовик - .suffix = Дробовик, Эскадрон Смерти, Death Squad, ЭС, DQ + .suffix = Дробовик, Эскадрон Смерти, dq .desc = Энергетическая дробовик с новейшей техников лечения. firemode-name-kill = режия для убийства diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/smg.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/smg.ftl index 4d09483832a4c6..110ec41b564a73 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/smg.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/smg.ftl @@ -1,3 +1,3 @@ ent-WeaponRifleSP = SP-91-RC - .suffix = Пистолет-пулемёт, Эскадрон Смерти, Death Squad, ЭС, DQ + .suffix = Пистолет-пулемёт, Эскадрон Смерти, dq .desc = Крупный пистолет-пулемет использующий патроны калибра .45 магнум. diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/turret.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/turret.ftl index 577bfa0ebd21ef..70aee6f39d2760 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/turret.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/turret.ftl @@ -1,3 +1,3 @@ ent-WeaponTurretDeathSquad = турель - .suffix = Турель, Эскадрон Смерти, Death Squad, ЭС, DQ + .suffix = Турель, Эскадрон Смерти, dq .desc = Турель с системой автоматического огня. diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/melee/swords.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/melee/swords.ftl index a32086a122524c..89586c878f132a 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/melee/swords.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/melee/swords.ftl @@ -4,5 +4,5 @@ ent-OfficerCutlass = офицерский кортик .desc = Богато украшенное наградное оружие, что является символом офицера флота Человечества. ent-Chainsword = цепной меч - .suffix = Эскадрон Смерти, Death Squad, ЭС, DQ + .suffix = Эскадрон Смерти, dq .desc = Технологии и ультранасилие в одном флаконе! diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/meta.json b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/meta.json index 8561d2108dc25a..e6f9ac24a63388 100644 --- a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/meta.json +++ b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:IAmRasputin#5242", + "copyright": "Created by discord:IAmRasputin#5242, modified by ewerall (Discord) for SS14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/meta.json b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/meta.json index 8561d2108dc25a..e6f9ac24a63388 100644 --- a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/meta.json +++ b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:IAmRasputin#5242", + "copyright": "Created by discord:IAmRasputin#5242, modified by ewerall (Discord) for SS14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/meta.json b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/meta.json index f8036af7bfce25..5ed317bbc27707 100644 --- a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/meta.json +++ b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:IAmRasputin#5242, reptilian made by kuro(388673708753027083)", + "copyright": "Created by discord:IAmRasputin#5242, modified by ewerall (Discord) for SS14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/meta.json b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/meta.json index e488c2486108d0..5ed317bbc27707 100644 --- a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/meta.json +++ b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:IAmRasputin#5242", + "copyright": "Created by discord:IAmRasputin#5242, modified by ewerall (Discord) for SS14", "size": { "x": 32, "y": 32 From 7cb77202c0fbee1ac8724a54ac43aaad7f3888b6 Mon Sep 17 00:00:00 2001 From: EstKemran Date: Mon, 4 Nov 2024 18:49:01 +0300 Subject: [PATCH 44/47] fix --- .../ru-RU/ss220/clothing/Hands/gloves.ftl | 2 +- .../objects/specific/medical/hypospray.ftl | 2 +- .../entities/objects/weapons/gun/battery.ftl | 6 +- .../Entities/Mobs/Player/humanoid.yml | 30 +++++----- .../SS220/Entities/Clothing/Shoes/boots.yml | 15 ++++- .../Weapons/Guns/Projectiles/impacts.yml | 36 +++++++++++ .../Weapons/Guns/Projectiles/projectiles.yml | 56 +++++++----------- .../Hardsuits/dq_alpha_hardsuit.rsi/icon.png | Bin 950 -> 1046 bytes .../dq_hardsuit_commander.rsi/icon.png | Bin 950 -> 1023 bytes .../Shoes/Boots/dq_magboots.rsi/icon-on.png | Bin 406 -> 406 bytes 10 files changed, 93 insertions(+), 54 deletions(-) diff --git a/Resources/Locale/ru-RU/ss220/clothing/Hands/gloves.ftl b/Resources/Locale/ru-RU/ss220/clothing/Hands/gloves.ftl index f45e7f420aff04..7bb5a2da98be72 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/Hands/gloves.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/Hands/gloves.ftl @@ -8,4 +8,4 @@ ent-ClothingHandsGlovesJanitorJR = черные резиновые перчат ent-ClothingHandsGlovesDQ = боевые перчатки Эскадрона Смерти .suffix = Эскадрон Смерти, dq - ..desc = Силовые перчатки, значительно усиливающие силу удара. + .desc = Силовые перчатки, значительно усиливающие силу удара. diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/specific/medical/hypospray.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/specific/medical/hypospray.ftl index e3e8c12e162d78..5f5b3a7788a7fb 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/specific/medical/hypospray.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/specific/medical/hypospray.ftl @@ -1,3 +1,3 @@ ent-EmergencyMedipenDQ = божественный медипен - .suffix = Эскадрон Смерти, Death Squad, ЭС, DQ + .suffix = Эскадрон Смерти, dq .desc = Экстренный медипен, который в кратчайшие сроки ставит на ноги даже при самых тяжелых травмах. Из-за дороговизны производства применяется только элитными отрядами. diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl index 20bfa2f25bf4aa..3ec288c491b846 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl @@ -1,8 +1,8 @@ -ent-WeaponPulseRifle2 = пульсовая винтовака - .suffix = Винтовка, Эскадрон Смерти, Death Squad, ЭС, DQ +ent-WeaponPulseRifle2 = пульсовая винтовка + .suffix = Винтовка, Эскадрон Смерти, dq .desc = Энергетическая винтовка тяжелого типа, способна аннигилировать любые структуры. ent-WeaponPulseShotgun = пульсовый дробовик - .suffix = Дробовик, Эскадрон Смерти, Death Squad, ЭС, DQ + .suffix = Дробовик, Эскадрон Смерти, dq .desc = Энергетическая дробовик с новейшей технологией лечения. firemode-name-kill = режия для убийства diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index 813c1ec76bbbb2..b9824c95257524 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -16,20 +16,22 @@ ## Death Squad -- type: entity - id: RandomHumanoidSpawnerDeathSquad - name: Death Squad Agent - suffix: ERTRole, Death Squad - components: - - type: Sprite - sprite: Clothing/OuterClothing/Hardsuits/deathsquad.rsi - state: icon - - type: RandomMetadata - nameSegments: - - NamesFirstMilitaryLeader - - NamesLastMilitary - - type: RandomHumanoidSpawner - settings: DeathSquad +#SS220-Deathsquad-Update-Begin #Outdated spawner, use new ones +#- type: entity +# id: RandomHumanoidSpawnerDeathSquad +# name: Death Squad Agent +# suffix: ERTRole, Death Squad +# components: +# - type: Sprite +# sprite: Clothing/OuterClothing/Hardsuits/deathsquad.rsi +# state: icon +# - type: RandomMetadata +# nameSegments: +# - NamesFirstMilitaryLeader +# - NamesLastMilitary +# - type: RandomHumanoidSpawner +# settings: DeathSquad +#SS220-Deathsquad-Update-End - type: randomHumanoidSettings id: DeathSquad diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml index 759942a9091aaf..6d34113fe47ddb 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml @@ -69,11 +69,18 @@ # Эскадрон Смерти - type: entity - parent: [ClothingShoesBootsMagBase, BaseJetpack] + parent: ClothingShoesBootsMagBase id: ClothingShoesBootsMagDQ name: Death Squad Magnetic Boots description: The most modern magnetic shoes in recognizable colors. components: + - type: InputMover + toParent: true + - type: MovementSpeedModifier + weightlessAcceleration: 1.2 + weightlessFriction: 0.5 + weightlessModifier: 1.5 + - type: CanMoveInAir - type: Sprite sprite: SS220/Clothing/Shoes/Boots/dq_magboots.rsi state: icon @@ -90,3 +97,9 @@ moles: - 1.153853429 # oxygen - 1.153853429 # nitrogen + - type: UserInterface + interfaces: + enum.SharedGasTankUiKey.Key: + type: GasTankBoundUserInterface + - type: Jetpack + moleUsage: 0.00085 diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml index 1a0b1851a46cc9..32d5eeccabeb86 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml @@ -16,3 +16,39 @@ - type: Tag tags: - HideContextMenu + +# Death Squad +- type: hitscan + id: Pulsekill + damage: + types: + Heat: 30 + Structural: 200 + muzzleFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle_blue + travelFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: beam_blue + impactFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact_blue + hitscanSpread: + spread: 20 + count: 5 + +- type: hitscan + id: PulseDESTROY + damage: + types: + Heat: 100 + Structural: 2000 + muzzleFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle_u_laser + travelFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: u_laser + impactFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact_u_laser diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index a2721e58511e57..e7a52c0a0f7e8b 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -173,38 +173,6 @@ energy: 0.5 # Death Squad -- type: hitscan - id: Pulsekill - damage: - types: - Heat: 30 - Structural: 200 - muzzleFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: muzzle_blue - travelFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: beam_blue - impactFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: impact_blue - -- type: hitscan - id: PulseDESTROY - damage: - types: - Heat: 60 - Structural: 600 - muzzleFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: muzzle_blue - travelFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: beam_blue - impactFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: impact_blue - - type: entity name: laser bolt id: BulletLaserDestroy @@ -215,7 +183,8 @@ impactEffect: BulletImpactEffectOrangeDisabler damage: types: - Heat: 22 + Heat: 44 + Structural: 800 - type: ProjectileSpread proto: BulletLaser count: 5 @@ -232,7 +201,7 @@ layers: - state: greenlaser - type: Projectile - impactEffect: BulletImpactEffectOrangeDisabler + impactEffect: BulletImpactEffectGreenDisabler damage: types: Blunt: -10 @@ -246,3 +215,22 @@ proto: BulletLaserHeal count: 3 spread: 10 + +- type: entity + id: BulletImpactEffectGreenDisabler + categories: [ HideSpawnMenu ] + components: + - type: TimedDespawn + lifetime: 0.2 + - type: Sprite + drawdepth: Effects + layers: + - shader: unshaded + map: ["enum.EffectLayers.Unshaded"] + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + state: impact_laser_greyscale + color: green + - type: EffectVisuals + - type: Tag + tags: + - HideContextMenu diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/icon.png b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/icon.png index e58ff1f270bb542167c81cd67d2ba19d8afb7039..0ca06d292fe6ff3522cfbd1e19d22f923edac69f 100644 GIT binary patch delta 1011 zcmV-S5)&Y$2IvCrhHhtfyTbe_ zEYqKdm8l!B?5-OR>i6=?%7VgD<4tO1&*`R zlCO?df}ins0qBg>VxIALF^rgOg+R0sqfBO6=JQ!fB^x0GyBn(j>`ED~mNkH`d(t#5 z`umgIxbam(iX5vzCNo`^+3?I9PW&_#T>wzg1r_Tg!!vVFJoi^PR)Ksz3xMytxNe!b zuRrIVrJwlXxqk^NI_SWMcYfy0%b#MnWrPsnnMQD|Ob4}f#@VWh7~!-&abG9|fsSB{LFmzm78jLtlenas2t896VxdRHcsDQOrn zN%~sD4cRb5!-z@C8UUbh_C37*S0VR33``;N-_ZBVM}Gj=cCM++8#e6gJ6)GmIq?S7 z@poZymcEV8>TC;zjfVX;d=I#8nc>;%2q7>{i;F#LM59qM-AkCJg%E<_+3UD&xlxxu z6AC1gDd~A0VL~m`0mA5D3$D{mZoWi!BeSmdU~D$K-X)lQ?2589_jQY zJkP_aR_pegK^+0Z=$7g9%Ty}0PM(^2jZ&#drGHXpa`Fn>+xH2AeO6S3?d|&j2q7r+ z#<8pcOw%HrzSI1cU~=*bD=Ujc{`ef* zc8)~iYN;F_YT68j(MjpsfTBdSGW~8{c<;+B87> z;8 zsGGn@Hd%O)=jgr<(0v~ui)`a<76G#BCO}cNXi>NcVA!y0!4fDk0z^`wEP1+6$ttl? zQL52Ra{+=R=FZ$R=gvKM;GO;7Ej7<1!&s2-`2l(=jW5sX>VE>y>&>-RdY<5G{SW{( zHIBK~4>61dIS+tr5~uC$2eR2b#Bpqd5QInj0EAM;Z_`{w*8^E7n3PIYo;}-5#K=?z zwznU|I}<{1_t9gz<_cY10MOM1U2}!Ij~*k0xOCn>*;JG_Z+;;G`hA}u2=INE@BTRA zn~y$?eZGD1Gk;%ySV7nG2qDPjbO84Dew@1gREH?H<#G+ju>s;BrBan<^DqVnP$-xj zAHM`hbTAX;DFQLM!&0dlk57W|eK&D%NLU54me?%*iK+np-aUZh*ovaLx*!Y-Mt4Y7_1LMZiUMf;}ivg>1%0W&A zW-G%t4&mZrUT$vQiGw#9_i^10yN(Km-CnQB)K~u)h9DJQnG`ZJ*423!1bG zWq9k>=W=;@jlI1e7z{!jrwtId*y!6dSMj{x|84xs8PGIM0;sA$Q4|0S9;kd^)8ux*#r~d)~P1EFOWcY~@03T$sgu@~2@OA3#J3$ZxGt2H&0QHO_ z+u1bM@SJuw&1+2%h5^N5m0V88aqO8d95Vs9%nV~eeswPRK0QuHeRz&{cE+!x!G8nb pOHG%PU9Y`V#P{7RW8j_r36~X*1K diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/icon.png b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/icon.png index e58ff1f270bb542167c81cd67d2ba19d8afb7039..9e0b99d0a3f669b4b6ad3861bb2550af761ba460 100644 GIT binary patch delta 988 zcmV<210(#l2mc3}u{~qUjh$iQ)~Pj-qhdETf<}>C zR3t#A-XJzj#U^Vcw(R%--LYVU#G+CwHYoW5i0o29B@{u`B8Ny3CZ?lexno(HKkme? z9}COVMhRpb0vmcZ;~C%g?wNDXz4PED{_mJL$)b2XA#`Cxm}h)hvqQiga4#+&P_% zjrBl^9IHU3vf{s)EX!QGvqncfOGl9b=qNHB^(@!!tRc(tk?Z~r$0}eLbpX0u2iJA^ z{_V@$eDVjMzJK~U9R(EN<}W|-`OGZtOy;Q27`~_UsrGKHs_H>F;WyO!# zo=(v(E`ix17E}B+K@g};BZH}GmRL*yV6L{spt3?}W1ZiNOTbX2R_hT!;I0VN1-5NX zRBg*oQmk!pU(4~@#ya=49L3re-L3;b)wafJ$v|BIaDP|Jv0C3I0eqq5kY$mW2OCv?3q)<7C-d}>-wq|+*&eD^J1-}uOX z{^8n}e1G=ldzfa6W^-?>J;xr!-LAu}%$(orhEeBMX3jU^xcE!9(P;F5l;Q9ciju-{ z+LZbO9%s(eYCS?#vt%AOco2U6F5`5;AqA4jlu*@KKl#GKMG}cK0KUQOUJuuGDVM9b zu8ZC40iYH3}?D)0Tw44}y31cyZT5T(^2aXIJc|ejP zNPm({KELSyXBc&V=AZNw^db(8;!Bq0F@JDLL_t(oh3%HjZrer_g+Kj-q=q!yN@i(Ut^_$Y)TE7&{=k3> zsGGn@Hd%O)=jgr<(0v~ui)`a<76G#BCO}cNXi>NcVA!y0!4fDk0z^`wEP1+6$ttl? zQL52Ra{+=R=FZ$R=gvKM;GO;7Ej7<1!&s2-`2l(=jW5sX>VE>y>&>-RdY<5G{SW{( zHIBK~4>61dIS+tr5~uC$2eR2b#Bpqd5QInj0EAM;Z_`{w*8^E7n3PIYo;}-5#K=?z zwznU|I}<{1_t9gz<_cY10MOM1U2}!Ij~*k0xOCn>*;JG_Z+;;G`hA}u2=INE@BTRA zn~y$?eZGD1Gk;%ySV7nG2qDPjbO84Dew@1gREH?H<#G+ju>s;BrBan<^DqVnP$-xj zAHM`hbTAX;DFQLM!&0dlk57W|eK&D%NLU54me?%*iK+np-aUZh*ovaLx*!Y-Mt4Y7_1LMZiUMf;}ivg>1%0W&A zW-G%t4&mZrUT$vQiGw#9_i^10yN(Km-CnQB)K~u)h9DJQnG`ZJ*423!1bG zWq9k>=W=;@jlI1e7z{!jrwtId*y!6dSMj{x|84xs8PGIM0;sA$Q4|0S9;kd^)8ux*#r~d)~P1EFOWcY~@03T$sgu@~2@OA3#J3$ZxGt2H&0QHO_ z+u1bM@SJuw&1+2%h5^N5m0V88aqO8d95Vs9%nV~eeswPRK0QuHeRz&{cE+!x!G8nb pOHG%PU9Y`V#P{7RW8j_r36~X+DabW-gPgg&ebxsLQ0Mhph@Bjb+ From f0e5d6b22590010388dbf8b206379e629a6f0c1f Mon Sep 17 00:00:00 2001 From: EstKemran Date: Mon, 4 Nov 2024 19:11:58 +0300 Subject: [PATCH 45/47] fix --- .../Head/Hardsuits/dq_alpha_helmet.rsi/icon.png | Bin 322 -> 454 bytes .../Hardsuits/dq_helmet_commander.rsi/icon.png | Bin 322 -> 457 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/icon.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/icon.png index 868b329a67cb4261227224626d323ed14a52721f..ceaf7bc5bbe67ca5befccb3e117552a5aa66e01b 100644 GIT binary patch delta 439 zcmV;o0Z9JB0>%T78Gi-<0047(dh`GQ00DDSM?wIu&K&6g00DqWL_t(oh3%9*OT$nU zhM$Nb(b!_N+Mu8~=%6TMD-=2@g1bM%KOi^>uKp1bx;T|i9XjbCE-F;~!qkR}MUoql z>rf4fiix$0=79@`b6(!_UM^fnNJvQdixdh=GOD)sCkwLKaeuj4zvf&q!rp{@U}JO) z$GK7_C#NEN^~Byjzb!RQ`*fsf8q9A;zWvVvJT||bTUI8rU92at?VLRDKnTIPV$e|2 zZx*-v^h2ps?oI#z{2PKm&`{ItW%aPV;y@4x@Nb|mx?QX%aNRlpv&(DLo_vH5;i*0O z%r39J)BSpYR)6ar0DWNywY*CZi14W8UG#;ace-B>5IhRdEvj4Vc$Gu)#T^#+tK^G2 zc$Gt{TkD`(ZCy7Q88oG7W~6QBq%n|^#z0E0)=tCPwsX=nGje3m?9NAYd)HK6N;xw< z$MMM#-o+&VGt+aNot@HbHk7X&J`zj(7SqhgR4UEz@GvN@Tc_2!kG;I30MP!DUu(y? h>c}f0AtB-a@(hLJmuWehwSNEr002ovPDHLkV1j+s(P{ty delta 306 zcmX@ce28g+WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$h2fKQ04 zxVW^Tp@kKnker;7pr8mh53e@2pmju}JO{6H+hm_Z2SV@P5fu;wD&KEbmI0A)A}JR*x380z^B163VnJf6QI1t{9?>Eak-;s5r+LB3W69+!*L&S@LgAPiCY#EAM5xRHmNAL@XoeF-D?v9lvj z7ltulGMOXKwOGH+Yph6lp8qz+^E_&-=z03J1dO=IkMVR`@m$Z>3RG32cbCjIHE(f$<|i5G8uCkZ{de(5iKWPmU2j z*vG8b$L#hVcl9ck@#(wetF|W+QJKoJLRD3xf+$fzl<2wMcHgS1QCU`KA}Vj^5WT*Q zms8PPwt%PS2h4hX06;EVK&R8jcs%ko`P$zk%LOV delta 306 zcmX@fe28g+WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$h2fKQ04 zxVW^Tp@kKnker;7pr8mh53e@2pmju}JO{6H+hm_Z2SV@P5fu;wD&KEbmI0A)A}JR*x380z^B163VnJf6QI1t{9?>Eak-;s5r+LB3W69+!*L&S@ Date: Mon, 4 Nov 2024 19:38:42 +0300 Subject: [PATCH 46/47] update --- .../Prototypes/SS220/Catalog/Fills/Lockers/centcom.yml | 2 ++ .../Prototypes/SS220/Entities/Mobs/Player/humanoid.yml | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/SS220/Catalog/Fills/Lockers/centcom.yml b/Resources/Prototypes/SS220/Catalog/Fills/Lockers/centcom.yml index 9219a9e37033a7..cad89bf75f8b73 100644 --- a/Resources/Prototypes/SS220/Catalog/Fills/Lockers/centcom.yml +++ b/Resources/Prototypes/SS220/Catalog/Fills/Lockers/centcom.yml @@ -30,6 +30,8 @@ - id: Chainsword - id: ClothingOuterHardsuitDeathsquadCommander - id: ClothingBackpackDeathSquadOperativeFilled + - id: MagazineMagnumSubMachineGunSP-91-RC + amount: 2 - type: entity id: LockerDeathsquadSpecialistFilled diff --git a/Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml index dbd66639dca35c..249b0491fb6c60 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml @@ -122,7 +122,7 @@ department: Security time: 54000 name: Оперативник Эскадрона Смерти - description: "Офицер элитного отряда зачистки НаноТрейзен - Эскадрона Смерти. Приготовьтесь к массированному наступлению на станцию. Ваша задача, как тяжеловооружённого оперативника, - уничтожить всё живое на своём пути. И никаких свидетелей." + description: "Оперативник элитного отряда зачистки НаноТрейзен - Эскадрона Смерти. Приготовьтесь к массированному наступлению на станцию. Ваша задача, как тяжеловооружённого оперативника, - уничтожить всё живое на своём пути. И никаких свидетелей." - type: Loadout prototypes: [ DeathSquadOperativeGear ] - type: PassiveDamage @@ -195,16 +195,21 @@ equipment: jumpsuit: ClothingUniformJumpsuitDeathSquad id: DeathsquadCommanderPDA - pocket1: DoorRemoteCommand + pocket1: EnergySword + pocket2: EnergyShield - type: startingGear id: DeathSquadHealerGear equipment: jumpsuit: ClothingUniformJumpsuitDeathSquad id: DeathsquadHealerPDA + pocket1: EnergySword + pocket2: EnergyShield - type: startingGear id: DeathSquadOperativeGear equipment: jumpsuit: ClothingUniformJumpsuitDeathSquad id: DeathsquadPDA + pocket1: EnergySword + pocket2: EnergyShield From 06116516a8a5419f264ee648e3bddc7171d9f05c Mon Sep 17 00:00:00 2001 From: EstKemran Date: Sun, 10 Nov 2024 17:28:20 +0300 Subject: [PATCH 47/47] fix --- .../ss14-ru/prototypes/entities/objects/devices/pda.ftl | 6 +++--- Resources/Locale/ru-RU/ss220/job/job-description.ftl | 1 + .../ru-RU/ss220/prototypes/entities/objects/devices/pda.ftl | 6 ++++++ Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml | 4 ++-- Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml | 4 ++-- .../SS220/Entities/Objects/Misc/identification_cards.yml | 1 + .../Prototypes/SS220/Roles/Jobs/CentComm/deathsquad.yml | 4 ++-- 7 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 Resources/Locale/ru-RU/ss220/prototypes/entities/objects/devices/pda.ftl diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl index 1057a8db20c7e1..d07921a30409d1 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl @@ -85,9 +85,9 @@ ent-AdminPDA = КПК админа ent-CentcomPDAFake = { ent-CentcomPDA } .suffix = Фальшивый .desc = { ent-CentcomPDA.desc } -ent-DeathsquadPDA = { ent-CentcomPDA } - .suffix = Эскадрон смерти - .desc = { ent-CentcomPDA.desc } +ent-DeathsquadPDA = КПК эскадрона смерти + .suffix = Оперативник эскадрона смерти + .desc = Пахнет мёртвой станцией. ent-MusicianPDA = КПК музыканта .desc = Он наполняет вас вдохновением. ent-VisitorMusicianPDA = { ent-MusicianPDA } diff --git a/Resources/Locale/ru-RU/ss220/job/job-description.ftl b/Resources/Locale/ru-RU/ss220/job/job-description.ftl index 42e607dd6289f3..8aa88b1836ac56 100644 --- a/Resources/Locale/ru-RU/ss220/job/job-description.ftl +++ b/Resources/Locale/ru-RU/ss220/job/job-description.ftl @@ -6,3 +6,4 @@ job-description-senior-service = Сервисный администратор job-description-magistrate = Магистрат обязан быть гарантом корпоративного закона, координировать юридический отдел. job-description-prisoner = Заключённый космической станции... Что может быть лучше? job-description-blueshield = Ваша главная цель - защитить глав станции. Помните, вы не офицер СБ. +job-description-deathsquad = Член эскадрона смерти. Уничтожьте всё живое! diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/devices/pda.ftl new file mode 100644 index 00000000000000..b60e8c9c8650ab --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/devices/pda.ftl @@ -0,0 +1,6 @@ +ent-DeathsquadHealerPDA = { ent-DeathsquadPDA } + .suffix = Специалист эскадрона смерти + .desc = { ent-DeathsquadPDA.desc } +ent-DeathsquadCommanderPDA = { ent-DeathsquadPDA } + .suffix = Командир эскадрона смерти + .desc = { ent-DeathsquadPDA.desc } diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml b/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml index d8dcb2fe120ed2..261635f529472c 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml @@ -1,6 +1,6 @@ - type: job id: DeathSquad - name: job-name-deathsquad + name: job-name-dq-operative #SS220-DeathSquad Update description: job-description-deathsquad playTimeTracker: JobDeathSquad setPreference: false @@ -10,7 +10,7 @@ canBeAntag: false accessGroups: - AllAccess - access: +# access: #SS220-DeathSquad Update - CentralCommand departmentsToIgnoreInTitles: # SS220 Round End Titles - Command # SS220 Round End Titles diff --git a/Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml index 20f832790e6397..898a9eb11a517e 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml @@ -86,7 +86,7 @@ state: pda-magistrate - type: entity - parent: DeathsquadPDA + parent: DeathsquadPDA id: DeathsquadCommanderPDA suffix: Death Squad Commander components: @@ -95,7 +95,7 @@ state: pda-deathsquad - type: entity - parent: DeathsquadPDA + parent: DeathsquadPDA id: DeathsquadHealerPDA suffix: Death Squad Healer components: diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml index 0b73017ffc9dcd..4f4ec7bea1adc8 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml @@ -165,6 +165,7 @@ parent: IDCardStandard id: CentcomIDCardDeathsquadOperative name: ID карта оперативника Эскадрона Смерти + description: Карта, необходимая для доступа в различные области станции. components: - type: Sprite layers: diff --git a/Resources/Prototypes/SS220/Roles/Jobs/CentComm/deathsquad.yml b/Resources/Prototypes/SS220/Roles/Jobs/CentComm/deathsquad.yml index 7f00fafb1e70f7..4de64b6b98212b 100644 --- a/Resources/Prototypes/SS220/Roles/Jobs/CentComm/deathsquad.yml +++ b/Resources/Prototypes/SS220/Roles/Jobs/CentComm/deathsquad.yml @@ -10,7 +10,7 @@ canBeAntag: false accessGroups: - AllAccess - access: +# access: #SS220-DeathSquad Update - CentralCommand - type: job @@ -25,5 +25,5 @@ canBeAntag: false accessGroups: - AllAccess - access: +# access: #SS220-DeathSquad Update - CentralCommand