From 9019079d798c53d4eb4f14163c3f296030115b27 Mon Sep 17 00:00:00 2001 From: Swept Date: Mon, 24 Aug 2020 18:27:32 +0000 Subject: [PATCH] Adds a cat and then a gat (#1868) * Adds the cat * Adds the gat * Adds the calico to suspicion spawner * Fixed physics thing * Updated BB * Added Calico mag to ammo spawner --- .../Barrels/ServerMagazineBarrelComponent.cs | 1 + .../Markers/gamemode_conditional_spawners.yml | 2 + .../Prototypes/Entities/Mobs/NPCs/pets.yml | 36 ++++++++++++++++ .../Guns/Ammunition/Pistol/magazines.yml | 26 ++++++++++++ .../Objects/Weapons/Guns/Rifles/rifles.yml | 40 ++++++++++++++++++ .../Magazine/Pistol/calico_mag.rsi/base.png | Bin 0 -> 128 bytes .../Magazine/Pistol/calico_mag.rsi/icon.png | Bin 0 -> 128 bytes .../Magazine/Pistol/calico_mag.rsi/mag-1.png | Bin 0 -> 128 bytes .../Magazine/Pistol/calico_mag.rsi/meta.json | 23 ++++++++++ .../Weapons/Guns/Rifles/calico.rsi/base.png | Bin 0 -> 209 bytes .../Weapons/Guns/Rifles/calico.rsi/icon.png | Bin 0 -> 215 bytes .../Guns/Rifles/calico.rsi/inhand-left.png | Bin 0 -> 918 bytes .../Guns/Rifles/calico.rsi/inhand-right.png | Bin 0 -> 843 bytes .../Weapons/Guns/Rifles/calico.rsi/mag-0.png | Bin 0 -> 171 bytes .../Weapons/Guns/Rifles/calico.rsi/meta.json | 31 ++++++++++++++ 15 files changed, 159 insertions(+) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/mag-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/mag-0.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/meta.json diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs index ed7ec35452..cdda71816d 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs @@ -546,5 +546,6 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels Box = 1 << 7, Pan = 1 << 8, Dart = 1 << 9, // Placeholder + CalicoTopMounted = 1 << 10, } } diff --git a/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml b/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml index aa8e264353..f026ba3d01 100644 --- a/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml +++ b/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml @@ -41,6 +41,7 @@ - RifleSTS - RifleVintorez - RifleWintermute + - RifleCalico chance: 0.75 gameRules: - RuleSuspicion @@ -289,6 +290,7 @@ - MagazineClRifle10x24 - MagazineClRiflePistol - MagazineLRifle + - MagazinePistolCalicoTopMounted chance: 0.95 gameRules: - RuleSuspicion diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 37be27fe7b..b24b2d0d92 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -169,6 +169,42 @@ normal: cat dead: cat_dead +- type: entity + save: false + name: calico cat + parent: PetBaseMob_Content + id: CatCalicoMob_Content + description: + drawdepth: Mobs + suffix: AI + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Pets/cat.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: cat2 + - type: Icon + sprite: Mobs/Pets/cat.rsi + state: cat + - type: Collidable + shapes: + - !type:PhysShapeAabb + bounds: "-0.50,-0.25,0.30,0.25" + mask: + - Impassable + - MobImpassable + - VaultImpassable + - SmallImpassable + layer: + - Opaque + - MobImpassable + - type: Appearance + visuals: + - type: DamageStateVisualizer + normal: cat2 + dead: cat2_dead + - type: entity save: false name: sloth diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/magazines.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/magazines.yml index 2cd1763cd3..85bd3f04ed 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/magazines.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/magazines.yml @@ -103,6 +103,32 @@ steps: 6 zeroVisible: false +- type: entity + id: MagazinePistolCalicoTopMounted + name: Calico Magazine (.35 auto top-mounted) + parent: MagazinePistolSmgBase + components: + - type: RangedMagazine + caliber: Pistol + magazineType: CalicoTopMounted + fillPrototype: CartridgePistol + capacity: 100 + - type: Icon + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + shader: unshaded + - type: Appearance + visuals: + - type: MagVisualizer + magState: mag + steps: 1 + zeroVisible: false + - type: entity id: MagazinePistol name: magazine (.35 auto) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index f5b6503ddd..1d144ed9e7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -315,3 +315,43 @@ magState: mag steps: 1 zeroVisible: true + +- type: entity + name: calico m900 + parent: RifleBase + id: RifleCalico + description: A carbine with a unique cylindrical magazine design which allows for high capacity loads. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Rifles/calico.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-0 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Icon + sprite: Objects/Weapons/Guns/Rifles/calico.rsi + - type: Item + size: 24 + sprite: Objects/Weapons/Guns/Rifles/calico.rsi + - type: RangedWeapon + - type: MagazineBarrel + magFillPrototype: MagazinePistolCalicoTopMounted + caliber: Pistol + magazineTypes: + - CalicoTopMounted + fireRate: 3 + minAngle: 0 + maxAngle: 25 + angleIncrease: 15 + angleDecay: 25 + soundGunshot: /Audio/Weapons/Guns/Gunshots/rifle2.ogg + soundRack: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg + soundMagInsert: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + soundMagEject: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + - type: Appearance + visuals: + - type: MagVisualizer + magState: mag + steps: 1 + zeroVisible: true diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..c52c68456214b2135786b2739bf065c37c92daab GIT binary patch literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@o&cW^*8>L*gapN#7(1w{nz$S} z?+6rUED7=pW^j0RBMrz=@^oMzWb7Ex3 XQDloyP}lPZs%G$X^>bP0l+XkKMTQ{3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c52c68456214b2135786b2739bf065c37c92daab GIT binary patch literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@o&cW^*8>L*gapN#7(1w{nz$S} z?+6rUED7=pW^j0RBMrz=@^oMzWb7Ex3 XQDloyP}lPZs%G$X^>bP0l+XkKMTQ{3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..c52c68456214b2135786b2739bf065c37c92daab GIT binary patch literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@o&cW^*8>L*gapN#7(1w{nz$S} z?+6rUED7=pW^j0RBMrz=@^oMzWb7Ex3 XQDloyP}lPZs%G$X^>bP0l+XkKMTQ{3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..6b5c09158c0ad6f8edba2af1694be30d905797a6 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvp#Yx{*8>L*gapN#7&{0F%BiZF zB*d0}YyABVD9cz9-6l55OQFl^IVz^h&I zKU74z_a)n2_BuN~_5%g8uJN(FWq9~6{wz-%xAf5+SF%ptW?Z-`ODru>P}}+f&z@Bx z)=O6$pD=yShi$pKf7!PDL*gapN#7&{0F%BiZF zB*d0}YyABVD9cz9*FcE_Zhy^BFhq%6XcOJ_ zUrS6{zL43UY3Xuvkq6-=OJ}`Qy>apRy|zOQr*%)r>`=-PIW%MQ+Pa(zX`#J`baaw3 z8DBN3Pfgja^40W-?z)Ji;=2(nXaBW@KG3Z3`WpXbS$tvo|09fNzw<4b)~&x6Xg!0c LtDnm{r-UW|D11?L literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..157e2a6d644915fd29cc0aab2ea5f151b2b56156 GIT binary patch literal 918 zcmV;H18Mw;P)fQ?d{u zRlkJ?PhwhJ2~(V%wxXNO#`f@DJYL>)-5_@btJzkk&kvA4e{mv769 zv(whlv6E1;Z9o{b{Ox&j>fedSf&SqbOc4*F`NZV3$=DIrR{#VS&JLTtIV11+elzK8 zN%7eK{QR%{-ERL@+wfc(0MF;6jr>;{k@uCY*Cuv`$w$X@ke&(cK-C;o4Vo2{;iW^ zarfRset58TWyyy-fiW%&U}%ExdknL7x8rL+0w5mx)pyn-^Gc;_%=WeoxH16Xm<-Vb zoWQ{|eha(F_K@(@{oWPUw?TEeUtIi?qCt%3%`%OwEudYH?M2vM9m_t}SHR^=20$W% zgoa5i+znXo8yu#z#p_;NBtw^v0K<%qV&Qs_FfdIKAGLM8`~es51bb0Ma8+c?edpq> zzew5-L$1*IFf@)8kZZ_*9K?_*WIzsL$P_Xl2Qg#{8IXe*GKCDtK@6Ef2IL@yOd$hu z5JRSr0Xc{vQwnc@>n}x(c)j*MRrlTchM2FeXnoyh)c~c?!L%;G2sl^)6Lh}wbW$H+ zSQik>Zhd{^*vhF=EKYI&9BR5U0mQ@DXhLoCi_vRXH2^C*;7Hts2`Cs0$d0Djvp$Ybd@LbQaNQ{L~)T_AVf>I6|i` zAPMu;RSqWL8Dm&G0I#E+@dshs0F%0aSm0P)DV&fiZfWJE96QOZt2n6;Nm3V}%jU-C zzQT#MH}8zZ1I{W$&;&T|w{g;o;$e$}Bxfs7mv4nRp86`gL8=`gNPw4x6Q4eQ5IE~5 zvk#2ptuP-}7Z69V?1S2Y!-FkZeX5RQDjpcuX91q(F;EL9a9@Yj06T)Mz^oeZ>*&X* sei_@%07*qoM6N<$f=f2EdjJ3c literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..1b179d55a0eaa15af69e397b8c003598c8ccf730 GIT binary patch literal 843 zcmV-R1GM~!P)&=4h$j<``d4@~{wE$xJdqgv52R^GyqT7W3WY>X zR@;EyWzBcCZ=IdpZnx}gXBOTkA*E$@`u)C{dCTTK!7vQNFbu;m48xp5JXn74@Oh=3 zZ@1nA7cb3NzQ{#jo@Dj=Kjcmzpnp^l5&=-nciQje1b3D< z#Gl_i=j<;v)?;TL8oT=+qxaB1DhLZ(eHf^!XxYr{G^lE0j=g{Fg0D5XQ|WP630ir zc=Y(0oK*cH7XtzF^Ygdl`&M&P_&_nG-HbROUUIH18Q8~_J2ScL=NfCj5@036U@6%K#{8mz(ra6p4qH~ms0+8~-Is19#B2vo=*^JVOULPr3}5&Z*X970Xk z6ZKvNl(|jK4HEqUqfmDOnkGU)OH!ckcV$0;Dbjis(rWxgD6|8R3s8qg2MGjH9p2O` z>Aec3&4aObKpNCU@$T(QWB)JwFKu_FdA%XZ6omqSEp literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..e37aa9a0e8ab82a210bf10b4d71ae51adceb903c GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJB2O2`kcie~3D(64B0Wul{1P8o z4>U5fODyx5_1|7yUvRyZKtVx)g0@a1hi1ix4~ov7g@@~Fvh3=99dbBfyn`XmSM3