From afd30c5c753ae0b1068c90ae1c0c8df08462cdaa Mon Sep 17 00:00:00 2001 From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Thu, 14 Sep 2023 04:03:12 +0300 Subject: [PATCH] Telescopic shield (#20048) * telescopic shield * research * removed the shield from the locker * sound * eh * fix --- Resources/Audio/Weapons/attributions.yml | 6 +- Resources/Audio/Weapons/telescopicoff.ogg | Bin 0 -> 6609 bytes Resources/Audio/Weapons/telescopicon.ogg | Bin 0 -> 6765 bytes .../Entities/Objects/Shields/shields.yml | 68 ++++++++++++++++++ .../Entities/Structures/Machines/lathe.yml | 1 + .../Prototypes/Recipes/Lathes/security.yml | 8 +++ Resources/Prototypes/Research/arsenal.yml | 1 + .../inhand-left-shield.png | Bin 0 -> 751 bytes .../inhand-right-shield.png | Bin 0 -> 784 bytes .../Melee/teleriot_shield.rsi/meta.json | 33 +++++++++ .../teleriot_shield.rsi/teleriot-icon.png | Bin 0 -> 322 bytes .../teleriot-inhand-left.png | Bin 0 -> 658 bytes .../teleriot-inhand-right.png | Bin 0 -> 667 bytes .../Melee/teleriot_shield.rsi/teleriot-on.png | Bin 0 -> 383 bytes 14 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 Resources/Audio/Weapons/telescopicoff.ogg create mode 100644 Resources/Audio/Weapons/telescopicon.ogg create mode 100644 Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/inhand-left-shield.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/inhand-right-shield.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/teleriot-icon.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/teleriot-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/teleriot-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/teleriot-on.png diff --git a/Resources/Audio/Weapons/attributions.yml b/Resources/Audio/Weapons/attributions.yml index 6e59d34d59..a1e728b5d5 100644 --- a/Resources/Audio/Weapons/attributions.yml +++ b/Resources/Audio/Weapons/attributions.yml @@ -8,7 +8,6 @@ copyright: "User tosha73 on freesound.org" source: "https://freesound.org/people/tosha73/sounds/509902/" - - files: ["chainsaw.ogg, chainsawidle.ogg, chainsawwield.ogg"] license: "Custom" copyright: "https://www.soundjay.com/tos.html" @@ -28,3 +27,8 @@ license: "CC-BY-SA-3.0" copyright: "Based on genhit3.ogg from tgstation, modified by deltanedas on github." source: "https://github.com/deltanedas" + +- files: ["telescopicon.ogg, telescopicoff.ogg"] + license: "CC-BY-SA-3.0" + copyright: "User Nimfar11 on GitHub." + source: "https://github.com/Nimfar11" diff --git a/Resources/Audio/Weapons/telescopicoff.ogg b/Resources/Audio/Weapons/telescopicoff.ogg new file mode 100644 index 0000000000000000000000000000000000000000..3509ee68c08163b71727119820f940bbc13a1827 GIT binary patch literal 6609 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%0Ai%!XY5@%nO^v>05W4c4lV zEg5l|rBY9Ce!TS2I(!9#(YVxf^a4f2mEF=ZO`*gg-kp!f=DzU@8RkqAisxLFd>5t7 zv<@c6KRaaPZGqXZt(SMg^f?}azWUtrw)shMCTzkaIb*pp)+5Ov{lW|-#8O4{!-o-# z9m`K{jqTVzF_8cD?J3V@y>A=$tF*taw&%d{t0V5i6BCd-UgOyi@{)=68KSf5Y10R% zwqV?0q)+kf3R5MG+w)wXF5Jv8E1EfL_9>XKNG>#=HgL7`w+_mz7?g!UDL3t4ig6|b zw%z82E35XRU3A%|2lPuPU^k4`=}X6-{}$k978Hc}l$-gK^@PB3?Wib|;P`7EOcu4i zp0{-5i!mH3v_4p|1V=)~IoBi%oM^OrbiTC5x389wUbFbvFSj(0E}Gs5$Ki~R4qtU` ze(=(?@Emiw8(DYV!F!a_bG#8Hng06x>r(x)sg7sIz@PGwaM^?Dim`fbB~w!oR;>)o zktpuMl^fCU&B*KOlOESuPC#0$HwrSwD zx=t@PL*H>xnyWIq$!R98#=Bn6;=`~W-QUr5y-6`YWn0R&hOM8j&!0Fxxzf?Ox}z=Q z=zh$Pb(?NZM?4?;SxKeg)yXd%^J%)PviDau=f6Hd!#uEkibv$V%E+&0ZOyCSeV1Xp z#~>(83PZuq_7(-TW!#k}q*++oy0|Nw!fL$iKb}rTK-X_f Ycl65c9KUngEivtKm*h`bc97iv0laQAoB#j- literal 0 HcmV?d00001 diff --git a/Resources/Audio/Weapons/telescopicon.ogg b/Resources/Audio/Weapons/telescopicon.ogg new file mode 100644 index 0000000000000000000000000000000000000000..aec503d3fa280e5781a350c63341003a88acffeb GIT binary patch literal 6765 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 literal 0 HcmV?d00001 diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index af1aa6612c..ea5935957d 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -400,3 +400,71 @@ sprite: Objects/Weapons/Melee/e_shield.rsi size: 5 heldPrefix: eshield + +- type: entity + name: telescopic shield + parent: BaseShield + id: TelescopicShield + description: An advanced riot shield made of lightweight materials that collapses for easy storage. + components: + - type: ItemToggle + activatedDisarmMalus: 0.6 + activateSound: + path: /Audio/Weapons/telescopicon.ogg + params: + volume: -5 + deActivateSound: + path: /Audio/Weapons/telescopicoff.ogg + params: + volume: -5 + offSize: 10 + - type: Sprite + sprite: Objects/Weapons/Melee/teleriot_shield.rsi + layers: + - state: teleriot-icon + - state: teleriot-on + visible: false + shader: unshaded + map: [ "shield" ] + - type: Item + size: 10 + sprite: Objects/Weapons/Melee/teleriot_shield.rsi + heldPrefix: teleriot + - type: UseDelay + delay: 0.5 + - type: ToggleableLightVisuals + spriteLayer: shield + inhandVisuals: + left: + - state: inhand-left-shield + shader: unshaded + right: + - state: inhand-right-shield + shader: unshaded + - type: Appearance + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 70 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: /Audio/Effects/metalbreak.ogg + - !type:SpawnEntitiesBehavior + spawn: + SheetSteel: + min: 1 + max: 1 + SheetGlass: + min: 2 + max: 2 + - type: StaticPrice + price: 250 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 8d41bcab2c..2384160403 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -558,6 +558,7 @@ - VoiceTrigger - TimerTrigger - Truncheon + - TelescopicShield - FlashPayload - ExplosivePayload - WeaponLaserCarbine diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 50940deab1..c8260dc33f 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -106,6 +106,14 @@ Steel: 400 Glass: 400 +- type: latheRecipe + id: TelescopicShield + result: TelescopicShield + completetime: 4 + materials: + Steel: 300 + Glass: 800 + - type: latheRecipe id: Flash result: Flash diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 3b5a5d67bb..ea073954a3 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -121,6 +121,7 @@ cost: 8000 recipeUnlocks: - Truncheon + - TelescopicShield # Tier 3 diff --git a/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/inhand-left-shield.png b/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/inhand-left-shield.png new file mode 100644 index 0000000000000000000000000000000000000000..02fc79343efdb97ed694c7a06c073bcbe985ff38 GIT binary patch literal 751 zcmV&uTrVdcs!-Bm)m?!!Y{R*+<#L&(( z7eOxT`-h*Ua^=EQ8{^Ti`TFv-6{2^1dft4vzuwO4AGVGHJ_YiC+w-3J>e=@JQztZ9 zQy};dyg(KCJND9@q1pYm0hj|0Y0>H8S4=)iPisfE&$2RStEZ;8)Otz865J z0Q%UfeGF#OCozhgWB^4@GJql{89Z<^e!&ZI#|+T8_ifJ~EX5t4Ryfg2#x+Z3>_oI1j6xrT_qVa#W_ZNs*Auvjjc@oV2#;Nf7b6tuh6)KZYRn(C hoMZq+PBMTZ=L`E)(C3&})QSKA002ovPDHLkV1jP3Pv8Im literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/inhand-right-shield.png b/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/inhand-right-shield.png new file mode 100644 index 0000000000000000000000000000000000000000..0174ec54bc5ef28e7f259a0520664947dc89a2a5 GIT binary patch literal 784 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|V0` zPZ!6KiaBp*DdyaE5NZ4G#qFWq>Jps5>~=`KH&oemsvFz14Ou~s))sLFdk$?|5M+9z z@!+CKnmR$19*%6hK03LKj5qhbh%4!RQyhCg`uwinOJ3;pz58_Uef4=e`~40NTo?r` z0vTBRL>L-{SsfmTa9w!+efpJiX`9y`m#NR2mzBSc!6f7T;pO+Y+pjOHU=sd&`;xlg zjcKdCML9e0?g>7-SIXwf{q>=rqiW+02A?>l^-YY+AwAyII%`t(SIe-!v9*7AZJvGl zlCosh#fQ_^yRW*dyLo#6Ls-yi%QL@u2zXfFS37%es$#*~-N`RRFR1YR=HAGa za74&7`D^W34Jn4!X1^D$-)%sBsiXEGP70(&LvhRrHn zxkmB|f@j{Rew!A@nz5m8A-m;+YoAv$9R6m#lgmW)=gcWLb9|ew?5o}WfBWUPf#q|S zp4@(N{p{R|Gsm0H*Von9SD&nX+J5!kC4mck_B$j$S+bmnyT`xc->Vtj0t!-v#z%f~ z^=~l^XSij0@m;6-liv)%CugSLPMo|aB{tLg40DF&Oz-82=fXE#mtwNBj&cc|{aD!$ z9uX+fBkhC%}&1vQrhrYD78{u@j&XA)0c%k6e6ds*KLS&YgY(L{dtQi zXUau)fde%U4}QIz5w5tQs!B(ONy$R+fQ9xW?E_!$=oKB<)w6DsvC0IU)7Qlg=q&bD zgzBH(^lX~eY3tow9{Y?Bq}#@^vJ^~WS-I56s^!F`CwoI8??rNW>@z=5d|W_a!8C^1 zsU;jrp)=R*WimVUVo`aM(Cu7xMTNfxE=B)-c<_J|6UYz$88Y^qoW(!s$~s^YXYh3O Kb6Mw<&;$Sg&RiV; literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/meta.json new file mode 100644 index 0000000000..0966573c00 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/commit/84223c65f5caf667a84f3c0f49bc2a41cdc6c4e3", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "teleriot-icon" + }, + { + "name": "teleriot-inhand-right", + "directions": 4 + }, + { + "name": "teleriot-inhand-left", + "directions": 4 + }, + { + "name": "teleriot-on" + }, + { + "name": "inhand-right-shield", + "directions": 4 + }, + { + "name": "inhand-left-shield", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/teleriot-icon.png b/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/teleriot-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c64786b86803ce659bee285cbbba0642f92bb8df GIT binary patch literal 322 zcmV-I0lof-P)Px#{7FPXR9J=W)30j9Fcin}@BT#8)Ra<6Odes+FsSKdVN}-??vqu`&rV#uM<~~n zBVuAA%IM5`x#Gg^5rc_*T*Bd;UqS*&k|ar@WUbw-wcD-xzq!{GJLk5xA5WJ9F9)~% zcyi9ELZ|}#I2vOx#?bcT)b`_HUjs*NvpY@ke!48n$nzW#0idcXLI}hd0hs6c=Dv@b z0Q)dw4BmUPECV2fKv5K|>v|6LX8}ay>J51B&o`i#JW)J3L8}B>5M<0hu{m UIUOda%K!iX07*qoM6N<$g3fb^+yDRo literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/teleriot-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/teleriot-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..e2e170d529e52cdf3c1906b3440954eabf806dea GIT binary patch literal 658 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S$b zr;B4q#hkY@_j@S^iX5{y3|`_nS*gY0jCIaLziks)w_i@n*(y-OasPnVja0#HH@q;rih%aQLbyl9)A=6cRjj)=OvpsGe!1QCC23(dDn0; zW6QN1v(2|x+rNJIy#2axh}QYvr=AslJl=jgsN)>VQugWRC!bR{6K#V9jxfX184TFM zZ3*-JRcm!ibK8cZy8xwEx<&^;OXk; Jvd$@?2>>Vp9;yHU literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/teleriot-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/teleriot-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..9d56b04c188527311d1786be6c0070d0198644a8 GIT binary patch literal 667 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S$< zr;B4q#hkY@_hv~uinR87YztWI)+)dh>C1Ih@6IfTSvyQ-l)gTe|IoZ3wZo82T(fCb zi^xHNOFK7Q6kaiv*NJ1HTd%;OoM#;Ul09jH%Ko@cAD;gXz4re5;%N!V<{$6^QuVKHDUBP_gM=j9Z2ev;wzdrr+$}ffQA6zt%-|_a%JKKAI{(XFR zef#GU3mLb+tQ*ceFMe|L^<2isA9sYTzizCS!?*ozwxRm@8M!rg(r1h3zw;{i;pTSp zXm91*AElZ+4_7c?4>VB*h?L0N2lZ1=JKtSCp<%hvufL_wle!t(CT;MW`8)pR5#@sE zDksI54k@kOJN>3v)%rtBcZ_yPO13DZMDE+bu)RmFYeMQzkYJU@jq(+nY7!aqByB~? zt~gJ5%FX%U_Kh0GH`2R`E329W3<`_qPl*nh?|7);$IPUHXCDL@D_&Wjh)P!0K6s&f j!GyoBgCtO+bPx$IY~r8R9J=Wm7z|=KoEvM2o*)tG-PcB?|>tiDr6112?om>pwY;))SMwfogwE) zcm%|q9I<8vD=H2_d)bgC+-#17g#FZZcQgOrnduY~i9|w4RaKj+sy4gs|HPqIyl&cc zC>RRYO}o~bIMQ4mshjoSO=QR;oA+OOW+(}Gy||&t#*#9Hc&Th z7m9_9XBq>sCFq9bHUqIl83<|*uw2Y%58sUKOjHl#c}`IjhzJ127@Tu>?*Uy8s54-U zA8#wpzC0g~Xa8yt!5)T@it+DveS7yfwbsT{l^`@RwXaEi dB9Ztrd;&ckp0PRwiM9X$002ovPDHLkV1mNMp)UXc literal 0 HcmV?d00001 -- 2.51.2