From b348fed935159922c25513d381402437789f14e0 Mon Sep 17 00:00:00 2001 From: RevengenRat <138193222+Ratyyy@users.noreply.github.com> Date: Fri, 6 Sep 2024 12:15:50 +0300 Subject: [PATCH] =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D1=89=D0=B8=D1=82=D0=B0=20=D0=BF=D1=80=D0=BE=D1=82?= =?UTF-8?q?=D0=B8=D0=B2=D0=BE=D0=BF=D1=83=D0=BB=D1=8C=D0=BD=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Entities/Mobs/Silicons/borg_chassis.yml | 2 +- .../ADT/Entities/Objects/Misc/handcuffs.yml | 3 +-- .../Objects/Specific/Robotics/borg_modules.yml | 3 --- .../Objects/Specific/Robotics/borg_parts.yml | 12 ------------ .../Catalog/VendingMachines/Inventories/sec.yml | 2 +- .../Markers/Spawners/Random/security.yml | 10 +++++----- .../Entities/Objects/Shields/shields.yml | 8 ++++---- .../Prototypes/Entities/Objects/Tools/emag.yml | 4 ++-- .../Objects/Weapons/Melee/shields.rsi/meta.json | 2 +- .../Weapons/Melee/shields.rsi/riot-icon.png | Bin 383 -> 476 bytes .../Melee/shields.rsi/riot-inhand-left.png | Bin 847 -> 904 bytes .../Melee/shields.rsi/riot-inhand-right.png | Bin 863 -> 984 bytes Resources/migration.yml | 4 ++++ 13 files changed, 19 insertions(+), 31 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Silicons/borg_chassis.yml b/Resources/Prototypes/ADT/Entities/Mobs/Silicons/borg_chassis.yml index a845663a5aa..17427d23dc7 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Silicons/borg_chassis.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Silicons/borg_chassis.yml @@ -32,7 +32,7 @@ - type: Construction node: security - type: AccessReader - access: [["Secutity"], ["Command"], ["Research"]] + access: [["Security"], ["Command"], ["Research"]] - type: Inventory templateId: borgTall - type: InteractionPopup diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/handcuffs.yml index 0e2fa411fcf..7bdea345865 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/handcuffs.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/handcuffs.yml @@ -1,7 +1,7 @@ - type: entity id: ADTInfCablecuffs parent: Zipties - sufix: lingering, 1 + suffix: lingering, 1 components: - type: Handcuff breakoutTime: 3 @@ -31,4 +31,3 @@ icon: { sprite: "/Textures/Objects/Misc/zipties.rsi", state: cuff } spawn: Zipties maxCount: 5 - itemSize: 2 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Robotics/borg_modules.yml index db30157ca2d..1fa0c4c7cd3 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -17,7 +17,6 @@ - state: security - state: icons-detentions - type: ItemBorgModule - handCounher: 2 items: - ADTInfCablecuffs - ADTtelescopicBaton @@ -33,7 +32,6 @@ - state: security - state: icons-harm - type: ItemBorgModule - handCounher: 2 items: - Truncheon - ADTWeaponLaserCarbineBorg @@ -48,7 +46,6 @@ - state: security - state: icons-disabler - type: ItemBorgModule - handCounher: 2 items: - ADTInfCablecuffs - ADTWeaponDisablerBorg diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Robotics/borg_parts.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Robotics/borg_parts.yml index 7f9423a79e9..60bda2ceb73 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Robotics/borg_parts.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Robotics/borg_parts.yml @@ -6,8 +6,6 @@ - type: Sprite sprite: Objects/Specific/Robotics/cyborg_parts.rsi state: security_l_arm - - type: Icon - state: security_l_arm - type: Tag tags: - Trash @@ -22,8 +20,6 @@ - type: Sprite sprite: Objects/Specific/Robotics/cyborg_parts.rsi state: security_r_arm - - type: Icon - state: security_r_arm - type: Tag tags: - Trash @@ -38,8 +34,6 @@ - type: Sprite sprite: Objects/Specific/Robotics/cyborg_parts.rsi state: security_l_leg - - type: Icon - state: securityy_l_leg - type: Tag tags: - Trash @@ -54,8 +48,6 @@ - type: Sprite sprite: Objects/Specific/Robotics/cyborg_parts.rsi state: security_r_leg - - type: Icon - state: security_r_leg - type: Tag tags: - Trash @@ -70,8 +62,6 @@ - type: Sprite sprite: Objects/Specific/Robotics/cyborg_parts.rsi state: security_head - - type: Icon - state: security_head - type: Tag tags: - Trash @@ -86,8 +76,6 @@ - type: Sprite sprite: Objects/Specific/Robotics/cyborg_parts.rsi state: security_chest - - type: Icon - state: security_chest - type: Tag tags: - Trash diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index 47d6ab683d6..9c1bb5296a5 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml @@ -18,7 +18,7 @@ Zipties: 12 RiotShield: 2 RiotLaserShield: 2 - RiotBulletShield: 2 + # RiotBulletShield: 2 ADT no nullet shield RadioHandheldSecurity: 5 Bola: 5 #ADT tweak # security officers need to follow a diet regimen! diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/security.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/security.yml index f5585a5e32f..c3889707b85 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/security.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/security.yml @@ -1,4 +1,4 @@ -# Security +# Security - type: entity name: security loot spawner suffix: Gear, Simple @@ -52,7 +52,7 @@ - SecurityWhistle - Tourniquet chance: 0.85 - + # Armory loot spawner # Automatics are a complete mess right now, so the AK-MS And WT-550 have been commented out for consistency's sake. I have no idea what role these guns are supposed to fufill. - type: entity @@ -76,7 +76,7 @@ rareChance: 0.05 prototypes: - RiotShield - - RiotBulletShield + # - RiotBulletShield ADT no nullet shield - RiotLaserShield - ClothingHeadHelmetBasic - ClothingHeadHelmetRiot @@ -137,7 +137,7 @@ rareChance: 0.05 prototypes: - RiotShield - - RiotBulletShield + # - RiotBulletShield ADT no nullet shield - RiotLaserShield - ClothingHeadHelmetBasic - ClothingHeadHelmetRiot @@ -145,4 +145,4 @@ - ClothingOuterArmorRiot - ClothingOuterArmorBulletproof chance: 0.95 - offset: 0.0 \ No newline at end of file + offset: 0.0 diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index ceaa766aa02..b59e430a23b 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -126,13 +126,13 @@ - type: Blocking passiveBlockModifier: coefficients: - Blunt: 3.6 - Slash: 3.6 + Blunt: 1.3 + Slash: 1.3 Piercing: 0.7 activeBlockModifier: coefficients: - Blunt: 3.6 - Slash: 3.6 + Blunt: 1.3 + Slash: 1.3 Piercing: 0.5 flatReductions: Piercing: 1 diff --git a/Resources/Prototypes/Entities/Objects/Tools/emag.yml b/Resources/Prototypes/Entities/Objects/Tools/emag.yml index e10ecd05d99..b011a70793c 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/emag.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/emag.yml @@ -39,5 +39,5 @@ id: Emag suffix: Limited components: - - type: LimitedCharges - - type: AutoRecharge + - type: LimitedCharges + - type: AutoRecharge diff --git a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/meta.json index 2d2663c1580..a98cee17040 100644 --- a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/commit/84223c65f5caf667a84f3c0f49bc2a41cdc6c4e3", + "copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/commit/84223c65f5caf667a84f3c0f49bc2a41cdc6c4e3, riot taken from https://github.com/tgstation/tgstation/commit/6323ee68d9c893bd096b17a86470695038826143", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/riot-icon.png b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/riot-icon.png index 29b2087910cbbb5b62baa261772c246cea7a161f..553a225f865d1f5a6ef68f10a5ad741834e49996 100644 GIT binary patch delta 450 zcmV;z0X_cz0^9?TB!2;OQb$4nuFf3k0004&Nklp(z2z<(zsDIQ-~^8rTFo$tQeD4h5J>+=)e?tfb=5df%D657+C-fk6u zqhq~tcjsMbl71qA;=vvR!wKq?ga*(Yk9Gi*?Yq)m1<&;F`zUPwqZK6vCGF zqz^DOG6_JR+6us-eh$FS)+zwznNhtECe<#A+nXqn2=`Yp09@O`a~zUt7lvLE^%Ds+ zG%AFnk3+-J7=JBl&x`wTG=}Fmm>A#gDaydjwTEk46^YlwUEAX3+LN@DhtSYVxVH7? z+_f$7_lpJMsVuqaWzBOOT-(CbiwDH0HE!hAl@)a;U<8cYLkH#_0}Zh@7>nNTK^sh$A9)a;TE sP#5j#0APlcbZlm2{{R3007*qoM6N<$f?Cnp%K!iX delta 356 zcmV-q0h|8Z1OEb$B!3BTNLh0L01m_e01m_fl`9S#0003oNkli%mE9N#S5yJfOINLB22%e?aRkXBfNnXu z-2F?(NHT9|r2*FO?-<@ZyxxE=ew+O}n11u{0ay*q9Psq%Q-6l_P?|UZWbnz8CmC2- zSux~3efk8JBgJx(9RLaeb8~a7A;8DS2Mz&{LueKPzd3~%Hf`F3kp@5jWbw6Y*BDrY zq)9Q7^la#u-d)~+E(R-z4qm)}=kV$&81htg0JXuW14wqj^&ppXKbC~mjLZMJ76n_eZ;{T*g!bmbTVgiib zyHV3#qw#ukPM?Sa@OdfgYQ9tUOBp&CXxC~vZH;Y~zG_ZwB~v5j!9cqP&=C!H0o)nt zzar&pB_aVxFMOouTszfHuN5~}DxYye<>oCe_MY-(^8ow>bcHf%0?nAQ%86zoa!Y z)@nqK!1wtXzJJfpaQ5O&4Pg1eF93}E7XaQ(K5=bx_UV0X;o}GKq*sl|0-eWWW-Okd zr0WDiA%fuu07kJ;zL(2p$gk!auGe`yW&*_G3EoV{;HUl#Bfq2tJ5Ok}#*O@v_EZ1n%BEF4Ruxry z^9U@?O|=1LH)yc45}bcOYdzBtE12`|X8~BvEtl{6f#|#SWbdE}a42*X*mBzG<|}Qu znWIoB6bgkxp-?Ck3WZ{KNv1|jt1bR7t}F6IsDG9=;LcFL=m(7l6K_puUUOiF=K$Dg z1ElGQhR2~f%|Si>`>(|CRc?}s~u=Ho vju!{MKhX% zT6oR@cG>`Zt_0m^4(cH)kbo^ggETK*y#|`o94HhDg~EnEZE>dhF1lxH00000NkvXX Hu0mjfgUp+U delta 824 zcmV-81IPS`2hRqOB!3BTNLh0L01m_e01m_fl`9S#00094Nkl3u_O#B{}4>2a%Y!bzpazD!cn$*f8@!nPw*acjw>N-G7<9mjoz|HUJby8vu%< z4FJW_27uy_7;t3%)bL;9Uu%^el$v4mwj;6uc%tT^V=wmRj;?w8=MS4%Y@fY)vvbr8 zgPinsn)fcBz6HdPM1Xvv@|gXt9$AxP^2k)&1GpxSL^dGl^r5@aF3J7tGmhJKH-5VB z39I>h@haK>`+qnh8_?-=z^Oa|!!UgPR&BF&90&USU-omg=`>`sS*TX4?xccf?$71m{@oj_S05pXfJUPM$uU=JFc`RFK_)LWcT0bB zX5rHC{nH2JhLA)+KA#^O0jX5VjQ}(vXawNTB#3OlFMnee%H{HwdjNtHZ?#&Gm<=`= z)cmpLf3k91eT3vOc>Lm>lH4a2LbX-f`to{t%lQ8|aPnN~)4LVmW-8VJoW$CIE6X2l zibat3cS>Sy0D=?e)F&~ZUH@3xmD%U(^R5J`G)KfQ0&tgyySHw~_Vu@${`XL5azGLR zl>2i|&3|#k{vN=MHUJby8vu%<4FJW_27uyd13+=K0iZbA08kuq1H5^Cu01{FF-Q#% zdHwTei@))8ajpU!T)(~KeqJ7?_CSU_0{-UpvoHa|)*g7#_W(*Uk=GZW2#;6*2G+l~ zE?^s`_CSWz08uMo)ePX|?ZZX44O4p{Lu!Di6@S2#IMxOj(F_fcr8qIucG#eP1vciVurWV{tKAO?04$yQ4FHg(H2}b; ziRYzJ$AIWS`(W_mWu>(*LTK&ORlN3`U-1X(k;`V`bi3j5R09CyOgjHrDw)7qYPl?b z1$yp=lvgiC^V-^O+*DG@1OPx4;rZ?Mf?)eLFvix8ut8O{LpMgVBNaJCKr zW)@bLi+^2TE)ETgy zU56~iiL17O(As4wPPVh_whFU?EX9d_^JX*_`oqxdq@$^&LkR)|*uN8;|1yKv>||MP zf`DCpE2$*_yTt^6AV4h|br6c8005d=Iurmn?SDR_>8zXwZ-hFQ#ksc{?L`eZis)a6 z9Q#F37{FTqZ-fE71@J}~z*_)sgaNz-@J1NGTL5o_0lWq9Mi^lB#?a7+q8^{~#HtQU zFGXn?g2%V7+4{2N>G%f)V3$=eZGcgRz;0^1o-u%3Rza)*R&FkboPbpgroRG483O21 z8Go!AZdP%J}GDp+I{EG>emWCC&~ZKVrKu*fQyHoz!DU^lF@3YL$@^%(-Y>A4>s z1K4F1#72m>0N$83K+O;^)M5&&Sq1YCLpuf;f>Q4Ut!5Q0ACK!Z1fM5{ZG9ZR()~aI k%x4w!$KwKlKya-23u?r)loJEK>i_@%07*qoM6N<$f`O93&Hw-a delta 840 zcmV-O1GoIx2j2#eB!3BTNLh0L01m_e01m_fl`9S#0009KNkl*jE2k1|GS4>BLR12*YBX$Tc7+LL8w2B%C%h z8`WH}esjig%YSC$t9uR4pa^HKEV=7KT&$r2*tQK$;UOrB;;XkxTczVT&~EcB0Mc%l z@Uz=>=MzP!0II4&CX)fnvY^#!`Px#c6zIAR#bPnGV;(51uTEXOcB|L1HzH$=%z#Rz z0*ORopsmyCxNW>n{^a6?-pfb#{;v2K=YM5DI-L&9fPZ8%>1F^5VRN1V2+rku|20wu zbd_1i=ko(=0D==YO%tYPRp1ftw~uVpYVLfZi2NBma{f*(SVuNOrH^&%-LsW}b{^S# z>~tL zaHIerI8p!*94P<@4z&Q@b9q+(A+Q{SN&w;`ID0Dl3qNP)3&4Wwx0lzjWZ_Go&VWBY z0v)yi7QO_z2GHD0d<5j*;y#POfX&b5IV@TD5`U-!AU*=CqyS4^++T7_7QO^30f>(P zkIT_FU>F9lK+`n$lp4nxw=aP@190*Po*J`)^v%MTK%D{TBf!AWH^2()8#4gM8n-Wj zN&v5qfMo{M>su#OIM%p*3DiG>=p!J$f$aP~V8PYpRd*xA!j~ZT0U$V10NM`FN3d(= zC_(wibSGFXza4wuR00qm!PB(|z!Go&Ts;mW+u