From 30a3d825cfb33774a959558041d965749cf95773 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Sat, 8 Mar 2025 13:33:47 -0500 Subject: [PATCH] Adds shell boxes for the rest of the (practical) shotgun types (#28498) * Adds shell boxes for the rest of the (practical) shotgun types * she frags on my 12 until I --- .../objects/items/weapons/storage/boxes.dm | 58 +++++++++++++++--- icons/obj/shell_boxes.dmi | Bin 1239 -> 1770 bytes 2 files changed, 50 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 9d0ccb0c46a..aa737b29f66 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -751,52 +751,94 @@ /obj/item/storage/fancy/shell/tranquilizer name = "ammunition box (Tranquilizer darts)" - desc = "A small box capable of holding seven shotgun shells." + desc = "A small box capable of holding eight shotgun shells." icon_state = "tranqbox" shell_type = /obj/item/ammo_casing/shotgun/tranquilizer /obj/item/storage/fancy/shell/slug name = "ammunition box (Slug)" - desc = "A small box capable of holding seven shotgun shells." + desc = "A small box capable of holding eight shotgun shells." icon_state = "slugbox" shell_type = /obj/item/ammo_casing/shotgun /obj/item/storage/fancy/shell/buck name = "ammunition box (Buckshot)" - desc = "A small box capable of holding seven shotgun shells." + desc = "A small box capable of holding eight shotgun shells." icon_state = "buckbox" shell_type = /obj/item/ammo_casing/shotgun/buckshot /obj/item/storage/fancy/shell/dragonsbreath name = "ammunition box (Dragonsbreath)" - desc = "A small box capable of holding seven shotgun shells." + desc = "A small box capable of holding eight shotgun shells." icon_state = "dragonsbox" shell_type = /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath /obj/item/storage/fancy/shell/stun name = "ammunition box (Stun shells)" - desc = "A small box capable of holding seven shotgun shells." + desc = "A small box capable of holding eight shotgun shells." icon_state = "stunbox" shell_type = /obj/item/ammo_casing/shotgun/stunslug /obj/item/storage/fancy/shell/beanbag name = "ammunition box (Beanbag shells)" - desc = "A small box capable of holding seven shotgun shells." + desc = "A small box capable of holding eight shotgun shells." icon_state = "beanbox" shell_type = /obj/item/ammo_casing/shotgun/beanbag /obj/item/storage/fancy/shell/rubbershot name = "ammunition box (Rubbershot shells)" - desc = "A small box capable of holding seven shotgun shells." + desc = "A small box capable of holding eight shotgun shells." icon_state = "rubberbox" shell_type = /obj/item/ammo_casing/shotgun/rubbershot /obj/item/storage/fancy/shell/holy name = "ammunition box (Holy Water darts)" - desc = "A small box capable of holding seven shotgun shells." + desc = "A small box capable of holding eight shotgun shells." icon_state = "holybox" shell_type = /obj/item/ammo_casing/shotgun/holy +/obj/item/storage/fancy/shell/confetti + name = "ammunition box (Confettishot)" + desc = "A small box capable of holding eight shotgun shells." + icon_state = "partybox" + shell_type = /obj/item/ammo_casing/shotgun/confetti + +/obj/item/storage/fancy/shell/meteor + name = "ammunition box (Meteorslug)" + desc = "A small box capable of holding eight shotgun shells." + icon_state = "meteorbox" + shell_type = /obj/item/ammo_casing/shotgun/meteorslug + +/obj/item/storage/fancy/shell/ion + name = "ammunition box (Ionshot)" + desc = "A small box capable of holding eight shotgun shells." + icon_state = "ionbox" + shell_type = /obj/item/ammo_casing/shotgun/ion + +/obj/item/storage/fancy/shell/pulse + name = "ammunition box (Proto Pulse Slug)" + desc = "A small box capable of holding eight shotgun shells." + icon_state = "pulsebox" + shell_type = /obj/item/ammo_casing/shotgun/pulseslug + +/obj/item/storage/fancy/shell/incindiary + name = "ammunition box (Incendiary slug)" + desc = "A small box capable of holding eight shotgun shells." + icon_state = "incendiarybox" + shell_type = /obj/item/ammo_casing/shotgun/incendiary + +/obj/item/storage/fancy/shell/lasershot + name = "ammunition box (Lasershot)" + desc = "A small box capable of holding eight shotgun shells." + icon_state = "lasershotbox" + shell_type = /obj/item/ammo_casing/shotgun/lasershot + +/obj/item/storage/fancy/shell/frag12 + name = "ammunition box (FRAG-12 slug)" + desc = "A small box capable of holding eight shotgun shells." + icon_state = "frag12box" + shell_type = /obj/item/ammo_casing/shotgun/frag12 + //////////////// /* Donk Boxes */ //////////////// diff --git a/icons/obj/shell_boxes.dmi b/icons/obj/shell_boxes.dmi index 615e189a919174b537946d0235e69f4f26dc60c4..31887ff85aab56200d99bf72219b47b3c7af95fb 100644 GIT binary patch delta 1674 zcmYL{c~H}L7Qnx0EGUNwBA`(V9<)|Lt&vNRA1F#i4nZ*CP6=|9O1MEbo7e)m4W01XWdIp7m? zg4L~Cw?^AgGhyHwxK_;#Q4c5S@Eb~7LEW{|^E#c5%jGr$Fz;hBUk9+2 zU>`P{f|(f~A1^B_vp#;#*4B0m03E|v*9YSIfTQ29mDoNY8+Fe64zL@q0MO)y?kE9R zI1a>tJ_v&L;1Vos4pPy;1Ax5d($8{YWxzTlB!tiBd*L_b=;09=LH-wj$NcL!eQ%T- zjL-18luk@bOvy+jB?FMdEPnMU`MC|+V0zr`W1p4#sZX-*Z8^RDHm-or0|(|OkV7kr z=XTvAYDi4Eco-4iv?fn+gIRLz;@#wZE-6EY*OW7XnVhfecoqTeBDar)z3n~STfgo# z9Vm0Wzk~kn;!<$71$Hn`WA!^b<|$s=7Qwg>`iIpQe^+0gK{jlPifCbb7ocPwT~oh8|Y@*p!++fR%I#BM6yxZYZ)R4Wy7iM(v1I8L6KT{(kTAzum3J2wa zZ9TnFw5t4Us@T}Lj#9WRBH7zN^H766zZU*>g6!O=!O@W#!gSV^f;aK?**jzc0~P7p z8mBMY;HX2Yu~PQo5#iE?ZbCs!ig(kJ)=3l@kjo2}IO3x=KNu0&1!}T9CfioX6#8u1 zYWjk#Lsn}UfU1ocV{=mIG@U5hpp2U|5b)4*n^`0+=w8@+liKhx_P|lGeJ(>bDJe!8>SZ2RVz@t|-Mc`lQRU-x zJ9di(UM5O?Y$4~EFclRrj#A0z{m|vZaenWwTx6G1ZVrptCk$9>O_U%#8IyOoSoH}oe zklJvB^z`8eaL|KCYxbQF;HQn5Q>I6p0(%IRbZiKOGupF90R7DV1T^H}i$;twC^3KEYA9C_)8Ss5KSJ^4go?Y=~QpZu^H zMsu@q4^QXFi!UB5m-f3RV zvA+CgmL&uyHcx(UCn#};JPOtr3u^zGH<{7DP=0{_=z1G{y&}UUSItJBpbW4CF4tY4 zvphlnYmn_uqP7-ZFH`bXq{tVk!m9si8(p_1CR=N$nY6Ijze%vFZ73qL2;eJrhrNQxa OinFKvy&6suuKpXW@jhMv delta 1138 zcmV-&1daRZ4c7@JiBL{Q4GJ0x0000DNk~Le0001>0001h2m=5B0K2`CDF6Tfu8}2J zk$@q8tsx`;g#e5IfOr5N5NH>jot@UY58+w>iU5kPuCDykYyX4*l9H0ir~?0H0KmY& zqpwxC$61P#P@_Ae@&Et;0d!JMQvg8b*k%9#0LFS$Sad{Xb7OL8aCB*JZU6vyoQ>1H z4#FT1!11{}1!;Gq)z!t+m=5+88fYmH5%d6mKi*z!6Gyr2F8Sw|Tdtyq9L=q?)S|7kMR&>A8FL z6F3{PeE??fDbI#>ma`c|&IMq=0SEFpTriwOa)Mb5$8nrDQKC45^g=|P_w8`v2uwPE z>oKUF#X8$5XWkf3{k^cF$F7+l;R78{;?kck)M@|#0|iM$K~#90?V5j6+CUJ70WT(` zu?SR@A|$mxw9p0%Wh&qQi#23Zn&Oc?ZnJY?y3ao{b9udolVtFnZMB4YX}4V)9HoGgYqu-G*!^Q^!-eK&-WWDxc6)B2^M}$72NwZ_fK5-HS+}9<;RT8 z<2nes@S+<8HUic8PyzWg`o8Cwmdqp07c$ zS3)Ov-R~3fWWi3<>kkG)Krc9`5`_FaKqr`eO($o72pQ=EW z2-MVWJ^OD#yN-e8r)oBflOzd&H9RtsY2h_ce8WQt@AP9mW z2pGKm9~Jigj|zMLX8^6gW6tLn81#3a0qg$n3vhZqzrdisdjzcezbD}I{En}aN%aQV z3CscQ29NVOnqL6g{L^A_=7JMU5c!bLF+n81zyvE{@BgT<_kVOj=Kha=3VZ)Y7i8}L z$b#JcUp<11{U2SBx&NcW-~W*frT-HIK@bF?;kfSqOy&pO^?wHQgKqmjgZV+X{U1I* z2<6T z{w|Ku{3biW&1Q41g2;z|e2obr`4|&KZxWaNpMjv;{?B-R&{h9uJU{5F|0B;2;u|=g zA4E5BJwIr+0b|~E|3{u5#Be`9i0&Z$p&$r?AP5bIcm9tG`}`l3I_CeVu+RTdG3oDq z0e16$R80E27r<`*kIE`dk1rM{xCOL=FWW7nUF!@4Q%n%KNw(ZUf|an(|50I||D(b_ z|3`&={*Ma#{2vwe`9CV`^M6#>=l`hi&;L=8{_b4)4W(MmFuS7JH2?qr07*qoM6N<$ Ef&y?SDgXcg