From 47dd0ff2e88573a0788b76a767122ce930ac31bd Mon Sep 17 00:00:00 2001 From: TaralGit <76408146+TaralGit@users.noreply.github.com> Date: Sun, 11 Sep 2022 09:46:38 +0300 Subject: [PATCH] Advanced laser gun and four resprites (#11102) Co-authored-by: and_a --- .../Weapons/Guns/Battery/battery_guns.yml | 33 ++++++++++++ .../Battery/advancedlasergun.rsi/base.png | Bin 0 -> 491 bytes .../Battery/advancedlasergun.rsi/icon.png | Bin 0 -> 491 bytes .../advancedlasergun.rsi/inhand-left.png | Bin 0 -> 362 bytes .../advancedlasergun.rsi/inhand-right.png | Bin 0 -> 356 bytes .../advancedlasergun.rsi/mag-unshaded-0.png | Bin 0 -> 191 bytes .../advancedlasergun.rsi/mag-unshaded-1.png | Bin 0 -> 211 bytes .../advancedlasergun.rsi/mag-unshaded-2.png | Bin 0 -> 211 bytes .../advancedlasergun.rsi/mag-unshaded-3.png | Bin 0 -> 213 bytes .../advancedlasergun.rsi/mag-unshaded-4.png | Bin 0 -> 209 bytes .../Battery/advancedlasergun.rsi/meta.json | 40 +++++++++++++++ .../Guns/Launchers/china_lake.rsi/icon.png | Bin 291 -> 297 bytes .../Weapons/Guns/Pistols/cobra.rsi/base.png | Bin 342 -> 334 bytes .../Weapons/Guns/Pistols/cobra.rsi/icon.png | Bin 350 -> 339 bytes .../Weapons/Guns/Pistols/cobra.rsi/mag-0.png | Bin 147 -> 146 bytes .../Guns/Revolvers/inspector.rsi/icon.png | Bin 346 -> 437 bytes .../Guns/Revolvers/inspector.rsi/meta.json | 2 +- .../Guns/Revolvers/mateba.rsi/icon.png | Bin 336 -> 374 bytes .../Guns/Revolvers/mateba.rsi/meta.json | 2 +- .../Guns/Snipers/bolt_gun_wood.rsi/base.png | Bin 303 -> 360 bytes .../Guns/Snipers/bolt_gun_wood.rsi/meta.json | 2 +- .../Guns/Snipers/heavy_sniper.rsi/base.png | Bin 368 -> 296 bytes .../Guns/Snipers/heavy_sniper.rsi/meta.json | 48 +++++++++--------- 23 files changed, 100 insertions(+), 27 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/mag-unshaded-0.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index a2f02f0960..da81d464d5 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -354,3 +354,36 @@ - type: Appearance - type: StaticPrice price: 750 + +- type: entity + name: advanced laser gun + parent: BaseWeaponBatterySmall + id: WeaponAdvancedLaser + description: An experimental laser gun with a self charging nuclear powered battery. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/advancedlasergun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: Objects/Weapons/Guns/Battery/advancedlasergun.rsi + - type: Gun + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg + - type: HitscanBatteryAmmoProvider + proto: RedMediumLaser + fireCost: 100 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 40 + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Appearance + - type: StaticPrice + price: 63 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..709bcf6dc3f2c1dc6611450d9891b9e9e106975f GIT binary patch literal 491 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkP_R0{C&U#FMc_8W#KiT$9hU z0ooTC8L6S6ktv~JWn~o_9Gst@uc@hNW@Z)@6$K>SxdRG-R%(_6`2{olCk}k~k#U;^ z)O5wu#WAE}&fAH-c}|KvtqZ4~>)p6I@A3J!QH7iK{uf?XP~3a6=N;pp42^~D!dzZ= zf9gm1bAI`$r{`Ci{DsAqLqkV?e#$&n?(DT{3f^CI78J)SWR@{p&|k**)`X9FUD)Yq z*JfXT$B_R^_CPzsxt%kdIFwE(-N-ZF%q;o&qi3?$?zV_XY0kJgA?V!>95-?ALmr{}?=7{an^LB{Ts5-_X#< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d6fafcdae1a3e851198b2f37c996bf2f57d97f32 GIT binary patch literal 491 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkP_R0{C&U#yWy-`qEXa82&RfS_STH>d3XwaC39Bx3^bNQ25Kn)H|`ava&KgJv~yxBIy5Q$74n7 zIT#}&BQ-QMG9@&utgJ$VgY)zAH8nNO%*>*qqJZQQAJ6+hi!@7u{DK+&69>Ng$hge{ zYP#a-;uumf=k3JaJSRn-)`e5g^=@39_xSwVsKQNq{|m1xDDFMk^N#UPhQ`8nVJ@$` zKlP*hIluhW)AK7${=#C*p`jx`KV=>(clKH}1@A993yNbEGRqh)=r3b@Yr@C8F6{KQ zYqPJvW61v{d!U`++|C(J97-pYZseJ7W|sW?(KFd=_uUS|Wpmi4PprHz+qI4LLBWSQ z5us%gj~RZxE@6N5w(w!{TDcxY#`C*o%xm1weSHZ>j`Y9t$)0;R{91W0xZj)U**>NF qj}|?+Rj#q_>n;bw`vP}%9@J0G;Zu1Z_G>-Re+-_kelF{r5}E)4IM3w( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..fbb7994257dc86abb616ce49b3f8a4cab1b0b274 GIT binary patch literal 362 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND5x9Y6XFV_m6erUU0p*%L)+TgQd3j^Gce3#U|79+^?D9QhGz^6XBZf^ zFf>{PMrv5F9dv&M)WBa71j&jGuX_(ies@-8&im&qB9Tcg-47` zG87RXJAN8O{PMrv5Rkd&zeYTz#k@(X78j{=_d&RYhQ+Un`z7*a7OIYEL|nb$xlNI|8+S48o| zik^7J?g@;1lU)@;A~rJdO`pozka6vc8rz#NgRRS(UTB7PS*$U*qBZltfdf0!1;hR- zC~QenXFl93ykiari=Xx6dsv$ zdx~Nzqr`?~(upSypJFoLSRHV{gfU30fpPh7r9>ar37Z&r(&h&pQR3I+c4*kXTynL| iBAtr9Uc_m{DK+&BLL@-05zbvfv1aONX4Aw1c@XEhK{MS6IhrousSHLWjOaFgW(aM qN@L_59vic`Xq2_$b3=EbB+4krUmx1My$OE5mObUALLNA^q mB}6o=s=2DQYFD8IBSRYtoAkRgW_N+Q89ZJ6T-G@yGywoA4M02q literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/meta.json new file mode 100644 index 0000000000..40dad860e7 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/meta.json @@ -0,0 +1,40 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/commit/1d0e3dde0f89e7926be32a3706883c3f003931f8", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-0" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/icon.png index 8ace34ae731ba65c03eecf42bcd7948bf0e66eb0..8f6aa0ff73e1b9ae6a51b7cdd54d283841191f73 100644 GIT binary patch delta 175 zcmV;g08sy<0;vL!f`5`pL_t(|oMT|1GGJ6d6JTOOS0O}+3L#-bAwfY!AY^cL0ZAp9 zB_|mh3j-m8dnr&P&`40wFfGjt2pJ;ULmgO)jE#+rloSO8m6RAFI?6-BTOAV(jnYyg zB0`LS0v+WQAqHw`NyaAa?JY?Rt{oj6txgF*<$@wW6$%V4p(vrQAq+}j%UxU?z%+{k dX@N3y0RU``9!d}N(G>sy002ovPDHLkV1lMpIOqTX delta 169 zcmV;a09OC00;2+uf`5!jL_t(|oMT|1IuJq^P@tv?Mnz*GK`>x&bpi5O)s)kWjDbMd zn8CdiC=xELC@7c)1Zrsv5$&N4tQE?}#zsm&K_w-Ih>r4*@YWD9W23Z`h=>p)pg>1? zMTj#~T9UCzdwWX~gKI}eN2`Mx6VL(?pb7;Bm(WnxPzNTk10q~p9KeoXaUmf*hBN>G Xry3oj5=AW800000NkvXXu0mjf4^uwq diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/base.png index 6d29432260a32ea6cd7e936c8e739bfcec360c8d..42647a9d00ca2dcdd23f497a007c2683682b7aaf 100644 GIT binary patch delta 273 zcmcb{bdG6)TfJp~Plzi61A~T!hPk=9yu5s9XsD5q(f+Y0^XJ+pVwn~ zcDCvJK`Zal2Zq=45|%P=@QZk$vd~*xaQ$|-SwYIrf1h$#67p}M-_yhYXNgK~RhhU& zaUa_(=aNXbUwd-*sn`TO?)%|uapC)&`<%J$i(4)>gc@D&f5Lg@Ijg3!ch7SM1}+8$ MPgg&ebxsLQ0D3fe`Tzg` delta 257 zcmX@dbd70(o2-3+Plzi61A~T!hPk=9yuAF=r+18ujP~!}9vT`tF+sXsSy@?8QEny! zLuhF5qj>#kK((SJL4Lsu|FM984Zrk(3i>@=978JRyzS@aV^ZXCvA!Z0AXa|y_x!6# zVajjbGyPUjDVY^6VEL1Mo&J_^(*nbgl?;qm)s|naFm>=}d(SMr)au5f)z&vM*%r)? zG)SJ?7CB4sW7+y8ilIeyB}@|wH@Qzq{IluLvmu*iYjI-dZHFhZ&Xz_VH+}tG?!9+l6>ojM?i0{$44$rjF6*2UngH%8a&-Uz diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/icon.png index c86548ce6f4afa4d8527011a56571cf1bcb4a1b6..be9f287abfb4abc3b940e9f9720f53ab9de7eefa 100644 GIT binary patch delta 278 zcmcb|beU;_TfJp~Plzi61A~T!hPk=9yu5s9XsD5q(fuJYD@<);T3K0RZN6d2j## delta 265 zcmcc2bdPC*o2-3+Plzi61A~T!hPk=9yuAF=r+18ujP~!}9vT`tF+sXsSy@?8QEny! zLuhF5qj>#kK((SJL4Lsu|FM984Zrk(3Z{FyIEGZrdE5V%?~nqIYxJwBi+Hxb`fb1Z zsE_jRg#W$i+$XE@{Uk5W&$rNFf4khGrpQI%OoCWu(GQ;Vc0tD8z>6BH8|*p0hT7jv zJh11E!DHX!x@Wsec7}bLpuO~t7}KJ{Pu@2S_C@}G*23gHQzO4+y_4yZfDHTnhvjB} zs&qDe(=wlz-EtRe!Aq$(Cm4)F-->WdjeB^#l1bw%tMAvZf~G(>GI+ZBxvX)id(%V~1_lP^k|4iehX4Ov0IXPKLh(S?^QAL;`*^E_9guzOQO;v;eh^&>^EEHH3gcuht++d-| z3RI>l%wVC&mSV;VWGD+Wm@BYuvim0hv_`Qc$S;`TKOEHm|Nr+7nD-YV_76<8i5Z}=8X0G%O5wh&laC^GV^t_#7djV-t2}dr;cv<{9Ay} zeU5?B3EoiO#k}VX_h0$)G5Z(qI>*pbv#eGF)jLUcns@d}^cOD9n<4S&dnHqH0muBJ TZ_Io^uP}JJ`njxgN@xNAX2hL$ delta 298 zcmdnWe2Zy<1SbnK0|P^2Nc!=KimLUx0X`wFK)!>6LqkJ@udlDJu5Lm?!lq4|L`0lhqp+Ea+IgKtX_$VP_9#l2(_JYf@%rR%U&s0wY_X;^%E9%av4B6;)N) zCon8tW)a}Ja6w0RH+O_X#xk!7lO|7Irf{Vzbaj}okcdcWVav^(Rp)2U_VRLMEpRWG zdvmYY3h9Sh>n`uUZpFGmf#uqpd!^SM8(AX{uH)7b_?^I19cZ&H?fbjZ7fjqAxYyj< no2A>u@c!=Za!EEBF$M;aD1*v}8#G=49nRqC>gTe~DWM4f6qa^o?nP1SbbG0|SH0lCEPD6;yS{6=)84AL8-;yyrPN1QkIHN1I|Nt?%i&gu}NWG=r8jd`Ue{31m~vzGtds`V%oOH z*6LqkJ@udlDJu5Lm?f{3WprcIj; z95|q?sP5+ME+iz8o11HFXxew$Xcka4UrCT(FvEXj5bkwb1SqrA)5S5QVoq{`go6Uh zQeIgFlhqp+ESRCd!O^gzhxL(Gmr`F=UY7&QMFo*-adK+)8X8O?OkxQzopr0Oh%Bd;kCd diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json index c959a32fd7..2b2617d856 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from Shiptest at https://github.com/shiptest-ss13/Shiptest/pull/308/commits/252f82abfe3e74b6fbd7928b149bdbb9476a2624", + "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/commit/0b8f7b7694a4a814724ba8ed59f695916ce845ce", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/base.png index b0db0017a5520e99b62973d52eaf2300e31617a4..71800c387eae0a274cf704cbb5b7339fe87c54da 100644 GIT binary patch delta 299 zcmZ3_^nz)ETfJ+5Plzi614DLZdRS};)s`2`Yf)f8kkbaf2X zL`B>*R3rt3r6lDt%vGx#b%X?kjHD!e)irY*^;9K9tsVBw0vaS<666=m@E;+Y|yv#+Ns~#2UQiV7}MC;A6RYP zyRw+A?EnA(2y{|TQvm<}|NsC0|JBM=G5`Pol}SWFRCt_a(ZLPFFbD-uP&2?! zu3`hv*y@&I6{N2t&~^mGXo#p)||(4o&GCd}%)#TK6l_9$kH7KfUf^TJa%DFc9Fe@wibujY6-St5oRtbqwGA~^_$R(Q2sKTQNdV1+Pp@(uVf znW!Vy$ckXUk0k@LC1ivaazhZRqOS#Hu(Bs4B+mfm