From c7c09e33b95f137b9126ec81008d3d67eb42e6a3 Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Tue, 2 Jan 2024 16:03:49 -0600 Subject: [PATCH 1/8] Bbgun (#580) * Add BB gun * Clean up back sprite * Replace old code * Case? * Guess I didn't need that * Proper attribution --------- Co-authored-by: Jeff <> --- .../prototypes/catalog/cargo/cargo-fun.ftl | 2 + .../catalog/fills/crates/fun-crates.ftl | 2 + .../DeltaV/Catalog/Cargo/cargo_fun.yml | 9 +++ .../DeltaV/Catalog/Fills/Crates/fun.yml | 10 +++ .../DeltaV/Entities/Objects/Fun/toy_guns.yml | 42 +++++++++++ .../Guns/Ammunition/Boxes/toy_guns.yml | 17 +++++ .../Guns/Projectiles/toy_projectiles.yml | 69 ++++++++++++++++++ Resources/Prototypes/DeltaV/tags.yml | 3 + .../Guns/Ammunition/Boxes/bbgun.rsi/bbbox.png | Bin 0 -> 305 bytes .../Ammunition/Boxes/bbgun.rsi/bbbullet.png | Bin 0 -> 155 bytes .../Guns/Ammunition/Boxes/bbgun.rsi/meta.json | 17 +++++ .../Weapons/Guns/Rifles/bbgun.rsi/base.png | Bin 0 -> 404 bytes .../Rifles/bbgun.rsi/equipped-BACKPACK.png | Bin 0 -> 1929 bytes .../Weapons/Guns/Rifles/bbgun.rsi/icon.png | Bin 0 -> 404 bytes .../Guns/Rifles/bbgun.rsi/inhand-left.png | Bin 0 -> 1071 bytes .../Guns/Rifles/bbgun.rsi/inhand-right.png | Bin 0 -> 1178 bytes .../Weapons/Guns/Rifles/bbgun.rsi/meta.json | 29 ++++++++ 17 files changed, 200 insertions(+) create mode 100644 Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-fun.ftl create mode 100644 Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/fun-crates.ftl create mode 100644 Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml create mode 100644 Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Fun/toy_guns.yml create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy_guns.yml create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/toy_projectiles.yml create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi/bbbox.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi/bbbullet.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/base.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/meta.json diff --git a/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-fun.ftl b/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-fun.ftl new file mode 100644 index 00000000000..32d3ab61c37 --- /dev/null +++ b/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-fun.ftl @@ -0,0 +1,2 @@ +ent-CrateFunBBGun = { ent-CrateFunBBGun } + .desc = { ent-CrateFunBBGun.desc } diff --git a/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/fun-crates.ftl b/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/fun-crates.ftl new file mode 100644 index 00000000000..13291e9539a --- /dev/null +++ b/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/fun-crates.ftl @@ -0,0 +1,2 @@ +ent-CrateFunBBGun = BB gun crate + .desc = Contains 1 BB gun and 2 boxes of BBs. diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml new file mode 100644 index 00000000000..d994967a2aa --- /dev/null +++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml @@ -0,0 +1,9 @@ +- type: cargoProduct + id: CrateFunBBGun + icon: + sprite: Objects/Weapons/Guns/Pistols/water_pistol.rsi + state: display + product: CrateFunBBGun + cost: 1000 + category: Fun + group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml new file mode 100644 index 00000000000..45e371ac63b --- /dev/null +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml @@ -0,0 +1,10 @@ +- type: entity + id: CrateFunBBGun + parent: CrateGenericSteel + components: + - type: StorageFill + contents: + - id: WeaponRifleBB + amount: 1 + - id: BoxCartridgeBB + amount: 2 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toy_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toy_guns.yml new file mode 100644 index 00000000000..b5077d4a955 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toy_guns.yml @@ -0,0 +1,42 @@ +- type: entity + name: BB Gun + parent: BaseItem + id: WeaponRifleBB + description: The classic Red Ryder BB gun. Don't shoot your eye out. + components: + - type: Sprite + netsync: false + size: 50 + sprite: DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi ## + quickEquip: false + slots: + - Back + - suitStorage + - type: AmmoCounter + - type: Gun + selectedMode: SemiAuto + availableModes: + - SemiAuto + fireRate: 2 + soundGunshot: + path: /Audio/Weapons/click.ogg + - type: BallisticAmmoProvider + cycleable: false + proto: BulletBB + whitelist: + tags: + - BulletBB + soundInsert: + path: /Audio/Weapons/drawbow2.ogg #here + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + ents: [] + - type: Appearance + - type: StaticPrice + price: 275 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy_guns.yml new file mode 100644 index 00000000000..e5a401edd87 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy_guns.yml @@ -0,0 +1,17 @@ +- type: entity + parent: BoxDonkSoftBase + id: BoxCartridgeBB + name: box of BBs + components: + - type: SpeedLoader + - type: BallisticAmmoProvider + whitelist: + tags: + - BulletBB + proto: BulletBB + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi + layers: + - state: bbbox + - type: StaticPrice + price: 25 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/toy_projectiles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/toy_projectiles.yml new file mode 100644 index 00000000000..1f8f91a1d1c --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/toy_projectiles.yml @@ -0,0 +1,69 @@ +- type: entity + id: BulletBB + description: Don't shoot your eye out. + name: BB + parent: BaseItem + components: + - type: Item + size: 1 + - type: Reflective + - type: Appearance + - type: FlyBySound + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi + layers: + - state: bbbullet + - type: Tag + tags: + - BulletBB + - Trash + - type: Physics + bodyType: Dynamic + linearDamping: 0.1 + angularDamping: 0.1 + - type: Fixtures + fixtures: + fix1: + shape: !type:PhysShapeCircle + radius: 0.01 + density: 1 + mask: + - ItemMask + restitution: 0.3 #bounce + friction: 0.2 + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.15,-0.15,0.15,0.15" + hard: false + mask: + - Impassable + - BulletImpassable + fly-by: &flybyfixture + shape: !type:PhysShapeCircle + radius: 1.5 + layer: + - Impassable + - MidImpassable + - HighImpassable + - LowImpassable + hard: False + - type: TileFrictionModifier + modifier: 0.01 + - type: Projectile + impactEffect: BulletImpactEffect + deleteOnCollide: false + onlyCollideWhenShot: true + damage: + types: + Blunt: 1 + soundHit: + path: /Audio/Weapons/Guns/Hits/bullet_hit.ogg + - type: Ammo + muzzleFlash: null + - type: PhysicalComposition + materialComposition: + Steel: 1 + - type: SpaceGarbage + #- type: StaticPrice + # price: 0.05 diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml index 412a91a142d..a1b704d9b29 100644 --- a/Resources/Prototypes/DeltaV/tags.yml +++ b/Resources/Prototypes/DeltaV/tags.yml @@ -3,6 +3,9 @@ - type: Tag id: BeltSlotNotBelt #not a 'belt' +- type: Tag + id: BulletBB + - type: Tag id: CartridgeSpecial # For the .38 special ammo and revolver diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi/bbbox.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi/bbbox.png new file mode 100644 index 0000000000000000000000000000000000000000..cc5df022ee5003bf1279fc8966bbb4a2849d5e12 GIT binary patch literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJAD%9bArbD$DG~_>EDn4#?y*WR zVR3T?5^ZrDXI@?Xm7lii{Du33bwu9FCpnSHz{?;{~xl>J_g#%!k_EgtjqUbIL?@q^kzlq3Hbz$4Sy0V zes)c?<2w-Ecu|#0LgJsnpa1{oKfJ%c-eLQn^n|3Q2mk-?d?Cyv5y-$hDSUn1rQ?j7 zxEAr)+wV=@QQ<5zhl4q$-gv`jPD7iz53}s}3`_!2D}KF@yK!H^{YCbkCF_~z*;coh z%6fU8ylBU=;%<{9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi/bbbullet.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi/bbbullet.png new file mode 100644 index 0000000000000000000000000000000000000000..0093a3e2e71340c1a158399d684a08fbad4a694d GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz4^J1zkO5 t{b0B~hkI_ShpRu(Oup0z&op0O1}z|)1BgN3Qt)ID<>~6@vd$@?2>`!$D?b1L literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi/meta.json new file mode 100644 index 00000000000..4e6ba54e34e --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Velcroboy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bbbullet" + }, + { + "name": "bbbox" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/base.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..a83d8e92b62168689d7d633f9a6adad6acc0df6f GIT binary patch literal 404 zcmV;F0c-w=P)27XprN8coPkqtjdZy{+DMQJC4D50fG@yLfzaZIHOj`Z z@!FnU8r*;c_I^9_m?fYaU%`#nr#m3G0;B#wzb`(#ROjC!z35pZ7Y|`bJ`lOP^ob}e zvoFNeKKnqF2F*316o5c70`EV+S627f4mj(F0TJqec7YZ}SOc)5x2Lv#)sg5=v@$>` zMe|Kp3{eTdRggqf24oRUgINn8S&7;JGn7rvjz)m&jHq*fi2!&$)Tx9B0Ml{Uf6=Y& z;WDVI1XBdSV;7ac1%z!o8UuK7jA~Q@|E7+lX|i9^^y^gm{L(Mj9x5ha_PC}vj+0wE z2_n9_h7-Ve|3gZ(tq_g?i_7kR5meX?F@QM}kOiEajKF7TNnR#I0cKuO0IswWMF?jA y9@UJ%E4Rd~gj2v@L`uoF!8yQ0c+G(A{5S(z>bN2FH%*xU0000^Ma literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/equipped-BACKPACK.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..ce3d78d944dbcedefa5897cabfa2d5b6f514be90 GIT binary patch literal 1929 zcmV;42X^?0P)DHSN{^+^q zd(P*a-~IjCa~a@&elh;%`GX*UUNE*?4KtjRcdN!v^2Uz+ue0YqirKC7;-`of+9Mmq`amI z`5u3R$Wp1wggjx9?rASl@-RM1$-w0h=~@oA=O6@mjJ#-mys}J>(DqXcLkYla6+N|W zIRQW4e)_i8d_Jo;lg2BHvdcqRtb);whg*N|b)2End0q?l{La;c+2-&IfT^IPqoda> zOI2RmDrf@-tNPbIGT~SK4&ch3*N8DY4txy&CI&&n|4{4X1JeUpI5&F>>oM3@Gooy_ zfetFkQ+@_a=ln+T24d7|0T953uWxv*qfnOHxkfwKCusq@?^+f&n@1i{P2OVwFnQ<% z0(kTIHNPYe_28Nh;cyF_PAAxu9^%omqaCz6c^J^@qvvV+p<1;#xx6S@kx<42#Kif0 zqYHp14_{h=!!_>?{MpLGy|`Ab_Q|ms`WCzPc`m^KBP^zk!0`}Q2TbNbX9uDT!2J+{ z0H#~>XLB*<=6g8&65{m>`aU;rIm2olnegpCl)1M@I-NiX0IJYI6~Fwj+Oo`>1fb7F zGOVDJhz37eA|{h}YtY?>X#t?qYM#J=mFMyK42vZcbg-D9OwSWEH8okD^$80^H8x5B zJV}D?y@#_xt8$eQd4q!vFgj`kAF3nrB{I>@hNh+>x<04g=XC&LF%S$405cT1v|L75 zM)cNqYsPtWg8e3kHO!wE8D_H)fFSf>cM~pj`=;Y>x_i710E(=MWxl^z!8kDvfbE1G z7d(0d9CQL+xDc>+aWFFr0Pa~GvFm!5^GiB@X1m8H0H9!$5F|J`z+f_3!gy%zMvXNK7$<)NY(O1ticZO1=T?E8SH>Ss+KQe{m*oO zQmG6d8X9u_MuKBzvv~j&79{`zfk2F57%mhF8CtD&5LLtZEX+$(nSRTNJ&gAjE#)B)Z5#Y*Vxf< z4@tpKMwuxonWBiuKMX@dtJF`_zoN=g0-#D)t&|FdH%QF`eVW&_iWXbZl z?kC#Tgr`rRYEd;Q0dURXl1ep3y;5ml2C zfbVj!bEiPgI}Pm`USD6I6;;F^b_>$eRZ5YdVmQ?v7>A8quF4|4*@oN!u2~q<_4_9Or?)wcfR3UYEpMloQon!}-pZg3P_ zZO6epj5vC=s`>z`05SmR@b&z>BO^GYSZD0Z)o3&|&x+6)OrQojlbw4`+0j1=u4wFF z%wbm#SS>pm8yk_fX=DItX=%CQF#gF9Hb-S1u`GO4Utc>lD7vF5PXJ6E&+q@GRUi{d z%ovAl)Eo7M^$iX1I81sPLl8cI6yE~{qdhv!&c4B2hT#9Oz2eb_Zxt1pH|OkLpnG zcpH1Avd>m=5db@xK2is)1AwEA;x65j=$QDPP35dj7Jx54F9m?*`g2X^$uA@T&JHWd<1J7Hq0|KvR-i`QgJ_qPup`fP) P00000NkvXXu0mjf0KbhQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a83d8e92b62168689d7d633f9a6adad6acc0df6f GIT binary patch literal 404 zcmV;F0c-w=P)27XprN8coPkqtjdZy{+DMQJC4D50fG@yLfzaZIHOj`Z z@!FnU8r*;c_I^9_m?fYaU%`#nr#m3G0;B#wzb`(#ROjC!z35pZ7Y|`bJ`lOP^ob}e zvoFNeKKnqF2F*316o5c70`EV+S627f4mj(F0TJqec7YZ}SOc)5x2Lv#)sg5=v@$>` zMe|Kp3{eTdRggqf24oRUgINn8S&7;JGn7rvjz)m&jHq*fi2!&$)Tx9B0Ml{Uf6=Y& z;WDVI1XBdSV;7ac1%z!o8UuK7jA~Q@|E7+lX|i9^^y^gm{L(Mj9x5ha_PC}vj+0wE z2_n9_h7-Ve|3gZ(tq_g?i_7kR5meX?F@QM}kOiEajKF7TNnR#I0cKuO0IswWMF?jA y9@UJ%E4Rd~gj2v@L`uoF!8yQ0c+G(A{5S(z>bN2FH%*xU0000^Ma literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..45651d591226be1708ef9f23dffeed9a74eac900 GIT binary patch literal 1071 zcmV+~1kn45P)(l)TbFHmV_miZTV1qeSFYPO^xCbP znipm*KXaBdvUEtM1|mo$m<;ipI4)Ww{0D9_#1g^rdWzQBMNiVqbUZnAc!(W(87KIig0PdZY4(M@VV>EgU zgg5-a{*`R+a}!-C5@uR6DFD?voxMZ)sZ}DCVxhGxfMF}3eI_q25D2U>ohT~3gaN4W zVpGM5GP^h@8#D5`=hQbSNPmR7KIzrIol|ckZoJD$$c9x&0F|)_XEm zynxPyiN;dU`-k7q$`|G?Xu;zO#kJZ~+UK_mT;QQkyRFSe=l_L{;yx$<#v1)VX^yb5 zMKA?qG8wqqy99L(rUU!M?1at<0K5n{=`>~b4*47qiA1aw&ldE3J4t=d=S%WT5!a~M zX2k7mb)HS=djdGE)moKurDetM>;CARH77gHu;fF9g`R6>}(>jO!)>F2XMn! zM~=-nuP^(2FA^yX_6&7T+^ms|Z-7w%{VgSA%pwPRi7K$TzV&KwV*D~}L9lU5`vw>V zKovnjh(sdbvA-NRT=Qnnil-a4xP#(Q_y!mU5QktH^q55&gZ)S7XZJgYBWZsDD&GJS z0P#+q(N@@t3^#Rb0r~NU* pHUQcQqCUU_Ku!3t>!tY6@$kE0YM$GJd729N0mw(%|($P*a{GY8yerLOzvRt3rkIcZvSThHx6jq%TeWt z<>j3aT=atDD{-Z562B*?dJYa_44~9vaWrT@)oZj`Bru;02r>m%hSSr1KHoeCdIT@Q z2tWb4%UZO%(4kIEfisE;@CW_SGPqdn^ZU95SI*Iai~yXfs3B4afCVJ{6n?yS4yR@7 zvhIHz8Mbnyhjp3LRmX@I-5s=j(OyUvMsOT(g(67cxVpW!i}qgDt{4GaV)N6BnJ&2HF|XE1)XuLr`Jyh52!ANUWBedYEUdij9Oyq83qni)HD%@P z`Kihib&7YO)9K*!<8PE{5v%Lb&Lts)LLs>0-3vpmF&j38wMJVP)fAeIS}mqRM}vM8 zR4SF^%twrp5bT|pO=YTZ%m(IK-wX}eHbd9~fc&1%(4<>Ku3lSn4eF3u=c9Fbzq!bf ztv6WRUU&0Hr?YAOnhgNjPz+eE)?Y&A*YKl?)d3L7z#+$`zF$Hsd zHYEU~TD_;`aL9!qM#w>xfK6gVea}k5{yEAN5G4SzU~R7AvTZkVSDmbfq@-VP{`oAe zeN4rOv7WY(@E@dUcZ=ud2qGKmdokMkxHQFd_<_#ZjEv~Cx~j%Q$z9hwzBAfKM@YOi z>t__W{(GL0k$pwQty8|~OJ1+n&(;*({hMbLL-a_D>w3blrJ0Hl%4b2&np sqjQcR0R9LOCE`>NgakmPMU?k{0~I8|P`Ty&yZ`_I07*qoM6N<$f-7kpo&W#< literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/meta.json new file mode 100644 index 00000000000..702b7c61322 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Base by ∆∆Molotovthief, equipped sprites by Velcroboy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} From f66a755433e4a08ba70b5a08a4d4e6a2c5ffc15d Mon Sep 17 00:00:00 2001 From: DeltaV-Bot Date: Tue, 2 Jan 2024 22:04:05 +0000 Subject: [PATCH 2/8] Automatic Changelog Update (#580) --- Resources/Changelog/DeltaVChangelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 2d151bf9333..1c6f351c3cc 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1307,3 +1307,9 @@ Entries: message: Reverted Shotgun sprites id: 195 time: '2024-01-01T21:48:08.0000000+00:00' +- author: Velcroboy + changes: + - type: Add + message: Added BB guns! Don't shoot your eye out. + id: 196 + time: '2024-01-02T22:03:49.0000000+00:00' From 443d5162d48aecaa0cf0f5a517301390c5555477 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Tue, 2 Jan 2024 22:06:22 +0000 Subject: [PATCH 3/8] give revs a chance (#636) Co-authored-by: deltanedas <@deltanedas:kde.org> --- Resources/Prototypes/GameRules/roundstart.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml index 0aa15ef0dac..a254fb022eb 100644 --- a/Resources/Prototypes/GameRules/roundstart.yml +++ b/Resources/Prototypes/GameRules/roundstart.yml @@ -81,7 +81,8 @@ noSpawn: true components: - type: RevolutionaryRule - maxHeadRevs: 1 # DeltaV + maxHeadRevs: 2 # DeltaV + playersPerHeadRev: 30 # DeltaV - need highpop readied up for multiple headrevs - type: entity id: Sandbox From 754166c10f5179c09a3c80d846e47aea286c3fb8 Mon Sep 17 00:00:00 2001 From: DeltaV-Bot Date: Tue, 2 Jan 2024 22:06:37 +0000 Subject: [PATCH 4/8] Automatic Changelog Update (#636) --- Resources/Changelog/DeltaVChangelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 1c6f351c3cc..c36e033bb02 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1313,3 +1313,9 @@ Entries: message: Added BB guns! Don't shoot your eye out. id: 196 time: '2024-01-02T22:03:49.0000000+00:00' +- author: deltanedas + changes: + - type: Tweak + message: On very high pop revolution rounds, there can be 2 head revolutionaries. + id: 197 + time: '2024-01-02T22:06:22.0000000+00:00' From 335c7a3248bdbbf97b542ad613772d89161fa179 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Tue, 2 Jan 2024 18:05:25 -0500 Subject: [PATCH 5/8] Listening Outpost hotfix (#638) Update events.yml --- Resources/Prototypes/DeltaV/GameRules/events.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/DeltaV/GameRules/events.yml b/Resources/Prototypes/DeltaV/GameRules/events.yml index 7d1d3b8ca3b..b1ca156766d 100644 --- a/Resources/Prototypes/DeltaV/GameRules/events.yml +++ b/Resources/Prototypes/DeltaV/GameRules/events.yml @@ -56,5 +56,6 @@ weight: 5 minimumPlayers: 25 maxOccurences: 1 + reoccurrenceDelay: 180 #Somehow maxOccurences is broken duration: 1 - type: PirateRadioSpawnRule From 7a6da5fc17745e65cc11563f179f21669f1e9528 Mon Sep 17 00:00:00 2001 From: DeltaV-Bot Date: Tue, 2 Jan 2024 23:05:39 +0000 Subject: [PATCH 6/8] Automatic Changelog Update (#638) --- Resources/Changelog/DeltaVChangelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index c36e033bb02..7b82a06c369 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1319,3 +1319,9 @@ Entries: message: On very high pop revolution rounds, there can be 2 head revolutionaries. id: 197 time: '2024-01-02T22:06:22.0000000+00:00' +- author: VMSolidus + changes: + - type: Fix + message: There should only ever be one Listening Outpost spawning at a time + id: 198 + time: '2024-01-02T23:05:25.0000000+00:00' From 6d29704a5db4254e8f12cba57adbdb699840c98c Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Tue, 2 Jan 2024 18:36:04 -0500 Subject: [PATCH 7/8] Outpost emergency hotfix (#640) * Update events.yml * Update events.yml --------- Signed-off-by: VMSolidus --- Resources/Prototypes/DeltaV/GameRules/events.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/GameRules/events.yml b/Resources/Prototypes/DeltaV/GameRules/events.yml index b1ca156766d..a88e5296cba 100644 --- a/Resources/Prototypes/DeltaV/GameRules/events.yml +++ b/Resources/Prototypes/DeltaV/GameRules/events.yml @@ -55,7 +55,6 @@ earliestStart: 20 weight: 5 minimumPlayers: 25 - maxOccurences: 1 - reoccurrenceDelay: 180 #Somehow maxOccurences is broken + maxOccurrences: 1 duration: 1 - type: PirateRadioSpawnRule From b4c06fb528b179d93fcd3fb0e275402df216e793 Mon Sep 17 00:00:00 2001 From: Debug <49997488+DebugOk@users.noreply.github.com> Date: Wed, 3 Jan 2024 00:48:29 +0100 Subject: [PATCH 8/8] Seperate flag for whitelist commands (#637) * Update AdminFlags.cs Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com> * Update WhitelistCommands.cs Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com> * Update WhitelistCommands.cs Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com> --------- Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com> --- Content.Server/Whitelist/WhitelistCommands.cs | 4 ++-- Content.Shared/Administration/AdminFlags.cs | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Content.Server/Whitelist/WhitelistCommands.cs b/Content.Server/Whitelist/WhitelistCommands.cs index e2444188107..691b47ae23f 100644 --- a/Content.Server/Whitelist/WhitelistCommands.cs +++ b/Content.Server/Whitelist/WhitelistCommands.cs @@ -11,7 +11,7 @@ namespace Content.Server.Whitelist; -[AdminCommand(AdminFlags.Ban)] +[AdminCommand(AdminFlags.Whitelist)] // DeltaV - Custom permission for whitelist public sealed class AddWhitelistCommand : LocalizedCommands { public override string Command => "whitelistadd"; @@ -71,7 +71,7 @@ public override CompletionResult GetCompletion(IConsoleShell shell, string[] arg } } -[AdminCommand(AdminFlags.Ban)] +[AdminCommand(AdminFlags.Ban | AdminFlags.Whitelist)] // DeltaV - Custom permission for whitelist. Hopefully this is an or, not an and public sealed class RemoveWhitelistCommand : LocalizedCommands { public override string Command => "whitelistremove"; diff --git a/Content.Shared/Administration/AdminFlags.cs b/Content.Shared/Administration/AdminFlags.cs index 05b7a45a464..c33a6be86f3 100644 --- a/Content.Shared/Administration/AdminFlags.cs +++ b/Content.Shared/Administration/AdminFlags.cs @@ -89,6 +89,11 @@ public enum AdminFlags : uint /// EditNotes = 1 << 14, + /// + /// DeltaV - The ability to whitelist people. Either this permission or +BAN is required for remove. + /// + Whitelist = 1 << 15, + /// /// Dangerous host permissions like scsi. ///