From 82fe3d42ce4f011a01d25018446b4d149273b0ab Mon Sep 17 00:00:00 2001 From: hivehum Date: Fri, 3 Jan 2025 12:08:28 -0500 Subject: [PATCH 1/3] bulletcatcher --- .../Entities/Objects/Weapons/Melee/clown.yml | 52 ++++++++++++++++++ .../Weapons/Melee/bulletcatcher.rsi/box.png | Bin 0 -> 1170 bytes .../Melee/bulletcatcher.rsi/boxopen.png | Bin 0 -> 1029 bytes .../Melee/bulletcatcher.rsi/bulletcatcher.png | Bin 0 -> 702 bytes .../Melee/bulletcatcher.rsi/inhand-left.png | Bin 0 -> 823 bytes .../Melee/bulletcatcher.rsi/inhand-right.png | Bin 0 -> 822 bytes .../Weapons/Melee/bulletcatcher.rsi/meta.json | 28 ++++++++++ 7 files changed, 80 insertions(+) create mode 100644 Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Melee/clown.yml create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Melee/bulletcatcher.rsi/box.png create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Melee/bulletcatcher.rsi/boxopen.png create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Melee/bulletcatcher.rsi/bulletcatcher.png create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Melee/bulletcatcher.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Melee/bulletcatcher.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Melee/bulletcatcher.rsi/meta.json diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Melee/clown.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Melee/clown.yml new file mode 100644 index 00000000000000..fbc15ac408054b --- /dev/null +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Melee/clown.yml @@ -0,0 +1,52 @@ +- type: entity + name: ACME brand "Bulletcatcher™" + parent: [BaseItem, Tier1Contraband] + id: BulletCatcher + description: You can do anything if you try hard and believe in yourself. + components: + - type: Sprite + sprite: _Impstation/Objects/Weapons/Melee/bulletcatcher.rsi + state: bulletcatcher + - type: Item + size: Large + sprite: _Impstation/Objects/Weapons/Melee/bulletcatcher.rsi + - type: Appearance + - type: Reflect + reflectProb: 1 + reflects: + - NonEnergy + spread: 1 + soundOnReflect: /Audio/_Impstation/Weapons/pvc.ogg + +- type: entity + id: BulletCatcherBox + parent: [BaseItem, Tier1Contraband] + name: factory-sealed ACME brand "Bulletcatcher™" + description: Wow! An ACME brand "Bulletcatcher™"! It's what I always wanted! + components: + - type: Item + size: Huge + - type: Sprite + sprite: _Impstation/Objects/Weapons/Melee/bulletcatcher.rsi + state: box + - type: SpawnItemsOnUse + items: + - id: ACMEBoxOpen + - id: BulletCatcher + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + id: ACMEBoxOpen + parent: BaseItem + name: discarded ACME brand box + description: I hope whoever opened this gets the day that they deserve. + components: + - type: Item + size: Large + - type: Sprite + sprite: _Impstation/Objects/Weapons/Melee/bulletcatcher.rsi + state: boxopen + - type: Tag + tags: + - Trash diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Melee/bulletcatcher.rsi/box.png b/Resources/Textures/_Impstation/Objects/Weapons/Melee/bulletcatcher.rsi/box.png new file mode 100644 index 0000000000000000000000000000000000000000..59eb3706635f46cf245e764dca173152cd78ec8e GIT binary patch literal 1170 zcmV;D1a13?P)EX>4Tx04R}tkv&MmP!xqvQ>7vm2Rn#3WT;MdQ4z;di$$$1yloGT6sd}hSRXBUVg#A3z6vWHpKP>E-Wql&80e4*g7 z!g-6cT5q!Mp8SR3lD3lLI-PN(u!J-+5Fw+98tSkpuNpK`Ol0Xk;o~23{26k|)8swiat9cF(j`N3q#zxkTn66H=$neb$Sp9q=H}MD$LRx*r>vH5fP+I| zvO=@hecnCb&F$ZwZhk*eA99&dZn&)g000JJOGiWi{{Z;_0Esd*tN;K232;bRa{vG? zBLDy{BLR4&KXw2B00(qQO+^Rk0Rk5`BUt2ABLDyZ8FWQhbVF}#ZDnqB07G(RVRU6= zAa`kWXdp*PO;A^X4i^9b0#QjsK~!koV_+BsqhJ(_f>AIEM!_f;1*2dTjDk@x@&F?t z1yL4mT}F5R{};Cuzbu|JbUgO*_)FcFQy3VQo!C`&PMHy>KUoMF1oOD_e?u8*tDzGB zdo9mjX2@Y+U^sza9SgArem4KY`TYiAb&npsdGqZX1B0BLhzJ)KVRg6wA^il+dqJE& zq62{UB+qwF4F(3eBq4RyXGEy;6q3WIPFq_}j*pM>n0_?x-Ob-p3=G-~Jlvef{%3su z{^>C)1^_GtT)q0`(RX|yF9`|#tJ@!(qe@H?N)hG^oD83^=%;oHz!hWEib-mj2h%@) z{@%S09uQW~G}5a+fH@c>8unMyh2281T)v`Jq`i@L2;_wRq~(ZH9NWCYufvWVa zwp>pLyMyXk09N>2zPwB9uR}I8YI@^FaQ7(wnZWfwxL4+000hU kSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$g2m|l^8f$< literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Melee/bulletcatcher.rsi/boxopen.png b/Resources/Textures/_Impstation/Objects/Weapons/Melee/bulletcatcher.rsi/boxopen.png new file mode 100644 index 0000000000000000000000000000000000000000..9bf371dc27ca38d83910eefb8887083ea6253bb8 GIT binary patch literal 1029 zcmV+g1p51lP)EX>4Tx04R}tkv&MmP!xqvQ>7vm2Rn#3WT;MdQ4z;di$$$1yloGT6sd}hSRXBUVg#A3z6vWHpKP>E-Wql&80e4*g7 z!g-6cT5q!Mp8SR3lD3lLI-PN(u!J-+5Fw+98tSkpuNpK`Ol0Xk;o~23{26k|)8swiat9cF(j`N3q#zxkTn66H=$neb$Sp9q=H}MD$LRx*r>vH5fP+I| zvO=@hecnCb&F$ZwZhk*eA99&dZn&)g000JJOGiWi{{Z;_0Esd*tN;K232;bRa{vG? zBLDy{BLR4&KXw2B00(qQO+^Rk0RsR5A4XYP000008FWQhbVF}#ZDnqB07G(RVRU6= zAa`kWXdp*PO;A^X4i^9b0mMl}K~!koV_+BsqhJ(_f>AIEM!_f;1*2dTjDk@x3P!;w z7zHB>FcPaU%EGP7=r_4yue=NirC~hf!Sv-efOVz=#h3lCwZxUuLG0)8O^csZ+Oazk5f+ z0C@E1&6{uEMsNy{lM@l);u`n>L3alXym;~c{f{3s3;-C=)|Qjw<3rFe5Wi!_xhH}Q z3=2InjAY(p>O+?EZ$0}Hh?uh=+h@U6oN1h>*_}Bo<1G7$C5qfiF}@m zDKEWVHec;BQVdLBbK~#9ltZfFn6Fw1kC~f;qkM5HcFTQf$ng0546qnKKxAv zQy%7VT=FnbmA=)M>j`0ZP(2I0JpNMmlrk~kx~X+9I7A2f6DN9*GC2hhRc_i zxn{~>y5r^Xm#r2#_>~;VE01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXXu0mjfkub|^Y=n*{<6%C?5R5XZ= z5Ab>RJg1Fs9h+RF_lg$@#WCyM+1c4ms_Ossml^1l#2*farrG21F!$ft{Ky$Ic)#Cw zuh&b={hG%lf!_eh0tk`ZWHOQEXf%@h{eG{G$D_mAgY2~hkt~6t-7S~PYC4@t;P^V9 z&((Ij#da$YIR@NpHk07H-3}Q`e3XEUEEWsd^B}-RG9fWCt{i}G$`Kray$*WN!sT)i z`f(A&e!q9u>-8-VNdTy6tbPPXz)){l69_>J1_O7y-HOYR1n`yHm)LauDK>Qn5MhHL z!gCRbEC2$57NB}d@u1zaQv>mQK1CC`?)bw1iF=R2L;I=z|6%R}i7mtm#^&=mYykL& zt=`B15L-Hh@-dK79%B$_-yDcW02G^M0Uk41)tFEqOyET=;{(b(fXFa-e7jXm?G^ya z8C*EWIRch6gGC|?)Ye1>(Z$Z_7|cPe5bbKUsy3Sq=Et{&v@jb>ppjbj1vA>lS|f7= zCmXQQB`hj|b{v-j?|~E(ECssYYiYvU zI15D3L(K)V2e?)M;O$)yaT38tdjP?qC>?9Q2mFgD*&P;$)(kKMwwngQZv#?o1?HY9 zoTdZTe^k33R;6D_od5u+1`x?M#ktM^#31n8G=eQAJJ|yh{^!=~wHuGecpdX@`Y#^E z=4oS-!m~!OVcu;C7=U`vBN+c-Kkkgq89<;A1fOa0voil@_C5iuZ+8ed-sF=2000hU kSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$f|>X$e*gdg literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Melee/bulletcatcher.rsi/inhand-left.png b/Resources/Textures/_Impstation/Objects/Weapons/Melee/bulletcatcher.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..50a6b40f102b725f00bbd8814e8e364cf8b77533 GIT binary patch literal 823 zcmV-71IYY|P)EX>4Tx04R}tkv&MmP!xqvQ>7vm2Rn#3WT;MdQ4z;di$$$1yloGT6sd}hSRXBUVg#A3z6vWHpKP>E-Wql&80e4*g7 z!g-6cT5q!Mp8SR3lD3lLI-PN(u!J-+5Fw+98tSkpuNpK`Ol0Xk;o~23{26k|)8swiat9cF(j`N3q#zxkTn66H=$neb$Sp9q=H}MD$LRx*r>vH5fP+I| zvO=@hecnCb&F$ZwZhk*eA99&dZn&)g000JJOGiWi9{?W!AAx~VlmGw#32;bRa{vG? zBLDy{BLR4&KXw2B00(qQO+^Rk0Rk5u0npjIZ2$lO8FWQhbVF}#ZDnqB07G(RVRU6= zAa`kWXdp*PO;A^X4i^9b0QN~lK~#9!?c3cA!XOj|Q0pQr#b#Zn39~Rsed49DX^s5@ z&UrH?)ZXs`+Q{n#000000001Ru@FKCVV-OK+~YJ(<227P#u#IL_i?-03bzbiBXqV> zErVZsU&R_*5!Qm&00+;olu}Bmo~6_laPW-3yAjIuwq|mz4f{B21-!bzW&Cozt)*V@ z7cKo~7hLd_JP$bQc|jR>@A!fT0000000000007_%e>d;k*1;4S=j2i6!7pDQbz^92t8 z06fD78|d@yxz_#80000EWmrjOO-%qQ00008000000002eQh(2cA3Qk! z=&I)K&FlEqH7WdHexzrixyz&TyJ{<&VO+(B!h5#Uf1hJ+DVw`8EnX(T^z?~kLP-mE zXtl)&HZ%w%ad@4%a(U-bo0`|J=j~egE~#c({r&l-OQ!g+vA8_4xXjyK(Oi*t`I6;( zVfTp8ppNsM%Xy+E{FwN9)9L&<+I-wKX-7_^i+3m=NjiFXQ+wpqfX?*J#a*i|)+~Im z=}=|&=BWHl@8LqFznI;1;DoNhj%UxV?LGdI zdBXBF)AAddof9@WZN6T6&-TIDxA*7e)!7Hi7tIXJ+p!iHD{M*L?k)`SAlTR#GzBQa zS>O>_%)p?h48n{ROYO^mg6t)pzOL*q8JWZtIOiYNPyz}`mbgZgIOpf)rskC}I2WZR zmZYXAlxLP?D7bt2281{Ai31gV^>lFzskrs__Gw-wMG@A3t%9=_ZO%*=%33HCv+=?a z11lr@bCIhIKi)mvz@29f)BpkvZ30dl3q>aX@ar)=7IDhN|Fg;TqFa{N_J{Qjiu?a*T@XBN3ef77gsgq~hqq{s(A+PIpbIRUcd|mwc zoZ@recW<7c`@r?PcMtpQ_RS8DH&jejvf$>8VmY|}4)gh_miX>>H!3$O^=!NP)-2#Z xD4qX%$a!h?=XYxs`~-#~17B){XPU1sgBFm@0mLA1DR?r7@^tlcS?83{1OUQ|T)hAQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Melee/bulletcatcher.rsi/meta.json b/Resources/Textures/_Impstation/Objects/Weapons/Melee/bulletcatcher.rsi/meta.json new file mode 100644 index 00000000000000..4f029451094e28 --- /dev/null +++ b/Resources/Textures/_Impstation/Objects/Weapons/Melee/bulletcatcher.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "bulletcatcher by Carousel", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bulletcatcher" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "box" + }, + { + "name": "boxopen" + } + ] +} From f389fbdfb3e870e570b428fb4b0b96085062c680 Mon Sep 17 00:00:00 2001 From: hivehum Date: Fri, 3 Jan 2025 13:14:49 -0500 Subject: [PATCH 2/3] uplink --- .../_Impstation/store/uplink-catalog.ftl | 3 +++ .../_Impstation/Catalog/uplink_catalog.yml | 20 ++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/_Impstation/store/uplink-catalog.ftl b/Resources/Locale/en-US/_Impstation/store/uplink-catalog.ftl index 102259b843e0d4..d379950c50166d 100644 --- a/Resources/Locale/en-US/_Impstation/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_Impstation/store/uplink-catalog.ftl @@ -9,3 +9,6 @@ uplink-nemesis-br-desc = Precise and Deadly: the stylish Nemesis-11 Battle Rifle uplink-rifle-magazine-nemesis-name = Rifle Magazine (.25 Caseless) uplink-rifle-magazine-nemesis-desc = Rifle magazine with 24 cartridges. Compatible with the Nemesis-11. + +uplink-bulletcatcher-name = ACME brand "Bulletcatcher™" +uplink-bulletcatcher-desc = Security aiming guns at you? Worse, your audience? Put a quick stop to that with the ACME brand "Bulletcatcher™"! When they point that rifle at your face, point our patented pipe right back at them! diff --git a/Resources/Prototypes/_Impstation/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Impstation/Catalog/uplink_catalog.yml index 78305aa2c18f7c..8e7921d5142b1f 100644 --- a/Resources/Prototypes/_Impstation/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_Impstation/Catalog/uplink_catalog.yml @@ -18,7 +18,7 @@ blacklist: components: - SurplusBundle - + - type: listing id: uplinkZipperAP name: uplink-zipper-ap-name @@ -56,3 +56,21 @@ Telecrystal: 2 categories: - UplinkAmmo + +- type: listing + id: UplinkBulletcatcher + name: uplink-bulletcatcher-name + description: uplink-bulletcatcher-desc + icon: { sprite: _Impstation/Objects/Weapons/Melee/bulletcatcher.rsi, state: bulletcatcher } + productEntity: BulletCatcherBox + discountCategory: rareDiscounts + discountDownTo: + Telecrystal: 3 + cost: + Telecrystal: 6 + conditions: + - !type:BuyerJobCondition + whitelist: + - Clown + categories: + - UplinkJob From fdaa970fef0af416b6c333a0c9c43b706278b1b0 Mon Sep 17 00:00:00 2001 From: hivehum Date: Fri, 3 Jan 2025 20:58:35 -0500 Subject: [PATCH 3/3] opened box is also contraband --- .../_Impstation/Entities/Objects/Weapons/Melee/clown.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Melee/clown.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Melee/clown.yml index fbc15ac408054b..ffca4a05d73dae 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Melee/clown.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Melee/clown.yml @@ -38,7 +38,7 @@ - type: entity id: ACMEBoxOpen - parent: BaseItem + parent: [BaseItem, Tier1Contraband] name: discarded ACME brand box description: I hope whoever opened this gets the day that they deserve. components: