From 1043b402461bbacfcf00e543e4ea279dc11b49d6 Mon Sep 17 00:00:00 2001 From: Carol <292806487+CarolCuchara@users.noreply.github.com> Date: Fri, 28 Aug 2026 18:38:08 +0200 Subject: [PATCH] Added caseless shotgun shells (#6457) added caseless shotgun shells --- .../Catalog/Fills/Backpacks/duffelbag.yml | 2 +- .../Weapons/Guns/Shotguns/shotguns.yml | 1 + .../Weapons/Guns/Ammunition/Boxes/shotgun.yml | 17 ++++++++++ .../Guns/Ammunition/Cartridges/shotgun.yml | 14 +++++++++ .../Ammunition/Boxes/shotgun.rsi/base.png | Bin 0 -> 356 bytes .../Ammunition/Boxes/shotgun.rsi/caseless.png | Bin 0 -> 4398 bytes .../Ammunition/Boxes/shotgun.rsi/mag-1.png | Bin 0 -> 107 bytes .../Ammunition/Boxes/shotgun.rsi/mag-2.png | Bin 0 -> 134 bytes .../Ammunition/Boxes/shotgun.rsi/mag-3.png | Bin 0 -> 142 bytes .../Ammunition/Boxes/shotgun.rsi/mag-4.png | Bin 0 -> 155 bytes .../Ammunition/Boxes/shotgun.rsi/meta.json | 29 ++++++++++++++++++ .../caseless_shotgun_shell.rsi/base-spent.png | Bin 0 -> 4437 bytes .../caseless_shotgun_shell.rsi/base.png | Bin 0 -> 4410 bytes .../caseless_shotgun_shell.rsi/meta.json | 17 ++++++++++ 14 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/base.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/caseless.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-1.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-2.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-3.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-4.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/meta.json create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Casings/caseless_shotgun_shell.rsi/base-spent.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Casings/caseless_shotgun_shell.rsi/base.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Casings/caseless_shotgun_shell.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 56d04b0c157..679436ebdfe 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -447,5 +447,5 @@ storagebase: !type:AllSelector children: - id: WeaponShotgunHushpup - - id: BoxLethalshot + - id: BoxShellCaseless # DeltaV switched default to caseless shells - id: TreasureCoinIron diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 21ff848526b..1218e9826f6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -313,6 +313,7 @@ - 0,0,3,0 # smaller than BaseShotgun by 1 tile - type: BallisticAmmoProvider capacity: 4 + proto: ShellShotgunCaseless # DeltaV - Use caseless shells - type: GunRequiresWield - type: Gun soundGunshot: diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml index 34ed18191fb..a7c4d05b301 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml @@ -6,3 +6,20 @@ components: - type: BallisticAmmoProvider proto: ShellSoulbreaker + +- type: entity + parent: AmmoProviderShotgunShell + id: BoxShellCaseless + name: ammunition box (.50 caseless) + description: A box full of caseless shotgun cartridges, designed to leave no trace behind. + components: + - type: BallisticAmmoProvider + proto: ShellShotgunCaseless + - type: Sprite + sprite: _DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] + - state: caseless diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml new file mode 100644 index 00000000000..455fc6d68d2 --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml @@ -0,0 +1,14 @@ +- type: entity + parent: [ ShellShotgun ] + id: ShellShotgunCaseless + name: caseless shell (.50 pellet) + description: An advanced caseless cartridge used by most modern shotguns. Leaves no trace behind while firing standard kinetic ammunition. + components: + - type: CartridgeAmmo + proto: PelletShotgunSpread + deleteOnSpawn: true + - type: Sprite + sprite: _DV/Objects/Weapons/Guns/Ammunition/Casings/caseless_shotgun_shell.rsi + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/base.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..f460615079dcbc3bc4f0244f62ee6d194767a522 GIT binary patch literal 356 zcmV-q0h|7bP)hx<)!^4}S=qr;oC$=T7E*eH6r?v$|0={nqU@&~G zWz|}{fhhEq1nVMsSP_UqUv)bz&d)sKwUt`%^cX1MAXuK4tN8B(^k4}~6PYbGxqD>} zM;g-SWbkaUq1$PtzJE-92}Lh^*k;OTtF%jo^+{zgOC^y)Od`q8?g;b1re z>v#*m&GjV!&!bNO?(f<_@xd!Cpo=^Nx2)rBsbHbfcc5yxk-&7ms}z();THT1m4e@% z>%5JZ$y&Pt+QtVWWrD5H4|=K}^o;)h4u`|>@7M#Kfp=<`U7Q{O0000(2*!ox|^T=y566BE}sRlTJJdU(FnfVe%NG2u&30RlM zR!YR;Qfh0hy1uOuSBW+PBt-9Nzb=7XIitFm`sVi!2x7AkceiPnjd(Ixt+5Sgz zCNp#IZ+`dQ-*>-zGXAWL1rcE}VKSL4!kli*hG#@NLLPy?p32H^;i>xwEAoja?(W@^A#XL7H}9GIS=HIUsqeHD{-J2? zx6_W%;p;n>R;|4XZbbdt7rrAV?FD7hRP|4JukO44!|JkAsDEc9Mqk85XWn*p0 z(W6f`EDnC${_GP)6O!))*H=|ja}KBbyBCI`)&%NSXZy-^?cVCs`^j@R{qlXbXZ>%;u(-W5ZlR3vuO2SAWzEy(UY&NeZTs?9 zuxmwml&~VNrR@BNv#OZ3t*zX98J^hC_!<6apjPx zYHkTiYn*U)Yl{29m8v`KOAb(m>rYSkd(!O&N7W+Ps`jK7=F9F+4ql?=4^ACffBx&w zHy*h->#LUA~$`V%3 zDds1JCHQDa-~b|n_#CB95A8E30=zW5mduy}2|&aWgQCEag`^5@fT)#fC61bWd^xE| z3_}v!oQ=*lru9?6JAZx#wj1P5s;v|Yb z4kPfeZr&yGf)kNA8LLnx8WalXM+Wk9xGa`IdZ(vf1*iw+V_X=a#4(2h8~%hxG?hb= z{)B$^2~RHErdT%c2xV>-n96}uj2lj|z--AHWROa-^A1;_C@9{DU>rM$bCtPE0~n6Q zKq+uQQV-0J7=agg+mKiza+5rPa)u`Y!wvF}Ko8U&07I0;LK_9PObTi?8Wd8#G$*h; zM+YuhQcG!dIvq-BNiC|TG!#k^Rua{al-dTYfYR%jVN_ zBL+U#XM>{)PC{&O6!z;S4V_=`)4vYCU<61#7GzZVj>$D9*QgX26?m+>#^f560;2+t zb=Ut*uCSq(Dd2?vfV}Wksp441Hu#$Lh;`utqwFW?yY+)T&Cn9+N-y-tWZ_ZLA(w63 zG!+_yMYF{ed?RG~q)Cx2pZGq9rZ3FKgCj+r?*sOrG@W$(V>HwN8G-S;9{GjV=o$vjKX_fD8p_dh}`arw*rYj!S!Mas;k L4C7lV%WD4vbY405 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-1.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..d77e6507b00fc0910aba7e959d2561f9e0b122e9 GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzBTpB{kcif|=L~rn6a-id%6t;v ziHj^`S8it)6S}08kwaP0uAd0TO=D~gJvs9|53PjNBTiZBohMzr{0#T4{i(q!PC{xWt~$(69DIjFhu|W literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-4.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-4.png new file mode 100644 index 0000000000000000000000000000000000000000..9a3c99707fe47b7133a9a2c0937a993983074206 GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJBu^K|kcif|7Z>t27>KxD3_ly> zF)cxeWz{lfL6vz4k_)UC$Tv+$$YfRAncna_{*x*L!@n~dHzq%x<)&e)XlYEWN{FKgqS(|Z8l`E9sfjJoYC%P)O&41j@ z-tIo{@BKZ`^LwB7nR_>8XQhXQM28><5@yUWnBg52uAl(;>#nN$2Hs9oS@L)@NsJ#5vLiDpQw`^D1$aANgfBizw4o>#w znxG4b39ojnjq2=D#zhY3@_Yd?x(XQJoO2#*U`NQ$f_9N-7o}jYk zrJprstVN=mXO)MZjBLqgcGI%cAq_QKv8xx~4nG#yyE;EE^Jc^i1o5k3Q&O^xDJkRW zz$BX1)pul`_~lcbFBI-dEqH1GJ-;Ajp8w(ZHZU#p+@HVIzGP2$+?I#ya&-#&hes$tkf(-^+amxT5zVAwZOw7^VPVeU7kCM|fB++y32AwS1eIsr#U~ph} zOIdGxc-y9gi0u)}Zu0uR^nID(9c7XW1J|}vx-DDd!y`hk#cZx>e4hV}w}wbulz45; zz3{H4L&Tzk0sa4K=)m(Vx%*c%N9iBS%vccS_gM6MI|3qP1<#x3Sc{V{_rs zz7o5L1ipIAyLJEBmA&)7zIE%O;`a|-SNOGhJ{zb!UD@PEhQPJT|!x%G>~}h zE?9X8l9cRqQA`QoQ5qDn4xRYU;SMp%T6N-Fl?gYwQa~}AQN@9rsw@jrRl;bk;^f64 zNnR2X*a1(WUVEv-O?q`=A1?`?1+!F)`XGFXPMl}TMpK*|K$Q}u1jkanY=vCBI0Q}N ztTxhYNE@SoZ#r=?&$~#e)Z_6;JPL`EE0W5zTCEh9OXYG5A~1KQgQvWh!@W?T809bk zH^Z?mo^?7-0<-ATThU4gXe0G<~G(qohkEsClka{VXR3^ctcDr=)3^$)z0ZGOJ z`q3F~3*4ttGjKc0IR>Ow00+NtGDW)4ls&;9q*TP(UB0BCcvGBNnF*Y$oGbNVtc(v?r0H&ms1V+ed4Q7*Rw3LEU%hYNxiOT43^OS=D0u>~eu#iV%Q`j^z zl?qdFSxzCbaO7S))XNRTEI;>8Q`_YhvwSyd< z5@eHU2o0ftaS>WIq0$nMK+6H=h9xJk%5aHdbi~S#X^@kGrNi2(A|Q1+ihNUqg&|=& zP+Cf;RLJbJ!)(YD4p6+4vpAilIsYoS3 zDz%GnIf+lgJFTp(@_(U)?Sm$bE_w#*hW;ykrqMl>1Ik9{SG1BG@f zyW45wJroD@MNmhm6)aGnR%pW58a_J}?jON zNj|`&76a#v+F_^Z==6oJ>pK8M$WUnwA370?$;}j9k-F zU|Qgr>iWOQ74qmX1sw1nkOv->{@O!+4v$#@bY{8%84=`T%hNcmtL2t=BaqF$t)wA@Xni1XX<85uk)oZ^$bNJ6rzl!L+iH x2l4H)q#?&msz9p;H{}(;dO+)|y literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Casings/caseless_shotgun_shell.rsi/base.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Casings/caseless_shotgun_shell.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..0f67971d9da1fc0ec300c0a5ce39762832449c0a GIT binary patch literal 4410 zcmeHKeNYo;8sGFN2pFnTDn*fXZ3V?mHeY13N5q&QL>f#1%ZEC;+1-$>Nj78`2%PpT z<0p3NQLXqv&$I1;lu^>E<#vDdQjQ-Kcl8*0vNuYDG{{Zt4x7_ip&U>&y)^*Z)Xn zv%Amxdw#MG3@bj zcGk(jLWzfg86RthAm4SD^;>BZJbfU){7vXXi7JfEsGTDW%sUmnt$GJOaFzV6^T^Nf ziGgwEKde1>HUohzQH7CF(#^M?Wo|{^T=Xb2u_}1^&fe4Yc^^OCS(DlL$FTVITl;SB zV$#(Gn+In;I8q|0yIZy$3RUDH^~=tmvaxw57c5y*b+o7nzEaSr1nvR%-*YSb? zRh_1>V}E1x_Oe~^A>sMg%2bacgG2vyzUDVKLcjYgckY50eqtd=vYj;=t!ATfBpr}M z)#i$Zw5DZqo7b=Tb8_C?Zut6qV?@A(V>_u@+sq~VK3rZGwy^SX*+QwgeD`~8d7k^1 zY%QNQ=Vk|G8)ghh+GF7Ka#=?E&u=Z?9r?_g{rB&-cHE6_bG00>^)*Y9HUE4`Isay8 zUD=Ze$s5SlV3W!2sO`3eo#?nTZ{8=Z&A$Ep^+_qIvZ(3zr+r>feS2YVU~hMIZ9!{n z*qQRU@FU@?x&%Xe%89hFh635Q-JJ(XedWQ}u<+2%dHYKbtQNNUw&RQA7kB>dVb~W{ z=kfS+fp@;!+koX{WuIPK^SohJTIzhMWLDI%cLT!}d8;#~(~hJY?J=hYS+Du#2W1tM zq%dxVE9p_pz}>InEUR?pPXjJLvE{~4TYf*=p+)cXUpsw0cFVozKgzi9xHR-Y{|gtt zX?ZuLu`R(<@O{hs`ZjM+(0IyW8rE8K0b0q8?oi+nhhKNdi(g9J%0~^Q`VtB zKtVeieFsl}y{8ZEUibfH5Sa`F)|J|wbaXGmZoP>r5h<7jU+7%N%Rqb zz{Ln8>~lHYJmJ$LeqI7Ri)J|j`ys+cJ(6Rw!bZ-^z-pOVhM~zmwn&LA4S^HAw4KN> ztr(^NZ+gTb2p&Q%FD@>Y6{}>NH(##M>2z{TDOV~{fI#^Yw?O((H@`rn7~(K7JmqCQ z0?WB!k(0D>g@PVIz&Jb-pUY#hjMBULVHJQLav$lDD`c45<&uw|!3)VnfMhtJU!1{b zfqg2^V0f<3OEJksj9XYRo+8C;v5qo`Ddn>+k3T6O-UMefHHz~TdYyg@P01N2;{v2S zh)*#AFR=D8u_nYOj`-6V9|&+a%0B@;lDi)aP!b#;QfMhZmADRs!D`kcN*Ok0u{ue?&Usy+)LA#p74u_5S*(l66i87vg%;Q1 zDqM-HFde2;tHwaDFkT*%oXD!cWU8UCX^L0@I7v`Ctc%QN$q`-NzIL@g@#AsoWa&*`NHWWSXCp-I~IAM8A57m7(Q zW5@?O0#Au2gjJQBRG8DtnagrhO;bi4v#~8^rQT|_gB>Dm4S`3&s zWCN`WbVB)PD;(BKY&yTr{tQFYf=hK3OrR^Q*up8fk}aZ<_rNhL(3X~Bf}V)qKV7WZ3oOB&)Lb5dLc_&N0v)P~1jZo2 zY)KC4nl?weB>v@uY1P1V(`+(i?Ej zd(X_ikoIfOEjn(vLQBuho*z(SIKKL1qBqQbZ{@7=W1HUp z#@Bh{Ov{URt~Fb$_pIa>BM)BxaZ^{#R}s)(s+^0zh>vai;5n&g&b}QH4>|_l=y?dA zJ-qV!x4*8a{ABBiS1W4gT