From 6acfe6e7b227bc2287b630539173e49b0b563923 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Thu, 14 Nov 2024 19:18:02 -0600 Subject: [PATCH 01/16] W.I.P. Heal gun --- .../Weapons/Guns/Battery/battery_guns.yml | 37 +++++++++ .../Weapons/Guns/Projectiles/projectiles.yml | 35 ++++++++ .../Battery/heal_gun.rsi/0-inhand-left.png | Bin 0 -> 705 bytes .../Battery/heal_gun.rsi/0-inhand-right.png | Bin 0 -> 672 bytes .../Battery/heal_gun.rsi/25-inhand-left.png | Bin 0 -> 732 bytes .../Battery/heal_gun.rsi/25-inhand-right.png | Bin 0 -> 696 bytes .../Battery/heal_gun.rsi/50-inhand-left.png | Bin 0 -> 738 bytes .../Battery/heal_gun.rsi/50-inhand-right.png | Bin 0 -> 702 bytes .../Battery/heal_gun.rsi/75-inhand-left.png | Bin 0 -> 750 bytes .../Battery/heal_gun.rsi/75-inhand-right.png | Bin 0 -> 714 bytes .../Guns/Battery/heal_gun.rsi/base.png | Bin 0 -> 822 bytes .../heal_gun.rsi/equipped-BACKPACK.png | Bin 0 -> 1644 bytes .../heal_gun.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 1644 bytes .../Guns/Battery/heal_gun.rsi/icon.png | Bin 0 -> 870 bytes .../Guns/Battery/heal_gun.rsi/inhand-left.png | Bin 0 -> 741 bytes .../Battery/heal_gun.rsi/inhand-right.png | Bin 0 -> 714 bytes .../Battery/heal_gun.rsi/mag-unshaded-1.png | Bin 0 -> 171 bytes .../Battery/heal_gun.rsi/mag-unshaded-2.png | Bin 0 -> 186 bytes .../Battery/heal_gun.rsi/mag-unshaded-3.png | Bin 0 -> 198 bytes .../Battery/heal_gun.rsi/mag-unshaded-4.png | Bin 0 -> 192 bytes .../Guns/Battery/heal_gun.rsi/meta.json | 77 ++++++++++++++++++ .../Projectiles/projectiles.rsi/heal_bolt.png | Bin 0 -> 351 bytes 22 files changed, 149 insertions(+) create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/0-inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/0-inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/25-inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/25-inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/50-inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/50-inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/75-inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/75-inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/base.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi/heal_bolt.png diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 2b74330b141..40e254ebd6e 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -261,3 +261,40 @@ steps: 5 zeroVisible: true - type: Appearance + +- type: entity + name: Medi-Cannon + parent: BaseWeaponBattery + id: WeaponHealGun + description: "A 20 round semi-automatic laser carbine." + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi + - type: Gun + soundGunshot: + path: /Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg + soundEmpty: + path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg + selectedMode: SemiAuto + fireRate: 3 + availableModes: + - SemiAuto + - type: Battery + maxCharge: 2000 + startingCharge: 2000 + - type: ProjectileBatteryAmmoProvider + proto: BulletHealLaser + fireCost: 100 + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Appearance \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml new file mode 100644 index 00000000000..c655c73097f --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -0,0 +1,35 @@ + - type: entity + name: heal bolt + id: BulletHealLaser + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Reflective + reflective: + - Energy + - type: FlyBySound + sound: + collection: EnergyMiss + params: + volume: 5 + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi + - type: Ammo + - type: Physics + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.2,-0.2,0.2,0.2" + hard: false + mask: + - Opaque + fly-by: *flybyfixture + - type: Projectile + damage: + groups: + Brute: -5 + Burn: -5 + Airloss: -5 + ignoreResistances: true \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/0-inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/0-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..db5f11f725ec235cf672e7375735902da49c6e9c GIT binary patch literal 705 zcmV;y0zUnTP)Px%dPzh8xlp8bPsGguUBMIR3tZ ze!mZ%=Pixr`+iWb*WqE~@)sJ{>0?bx6EZD4nk+&%y59)_lu9Lf)qgPqd}uP6ga95- z-l5m)h0k+Aunr*F0)xQ-a3Cgx@TYhjq&QEy-7Z_6Y%eAdbSp$5_`W~W4k&xi^JY%o z_AMel1LgzbP^5W)|D%~eJ&(Vk>|f8mSWkRDFLnh`z;?SG42Q#TC~m(T!pHtoIOK5R z(|0VsTCGB>)e_4~ED(Z-Lcs3?0RLV^@hrE1>8-Kq=S3B;>S7ngR{$=aieyfz07=>| z#!>~icq)=PsRATvyBJFq;Nq!B=A;Ucr0rrXRe+19BAJsaK$5nLu~Y#ro{D5nssKsa zoUzib&a5jSZ6aCVWbq_e2Y?GvskIhDqvCNBjk`!wQ-*Z_S$qK|Dxi&0r_%u}KJ5b4 zI)Jpk0F&aQ9s=Abp%H`D=qB%B+YF`f1(@V*)k9!i0oVeDzJN@{XY~+R2SC*%@dcPv z&gCIs13<;a`2tLfN8b>BY+pH%?T n#9fQ03UKX2r1QzW0)7C#pl49XO#fa00000Px%T1iAfRCr$Pny+udP!Pwj$^38=h$ZkBfF+a2sfDV^$z>kQG6Q~@oSZ6|nnW&G z_zNJJK+G|}q{}rq@)-SbuPuG_y{n@f?fZW2dxyC5!12p-Tt5f^ae(6lqy!u{fHXlV z0Vx5;2}lVzZUFfgkP_gOK)c-zSF4qkurfuV_*Sb0>-8Gy06{ldsQ^fPqtSrHV&M*e zAPBS5CK5j`@X-I`MPxdET>T;S0MyJuqy|TY91d%bzkSE zmjnbIarJT@l>=VX6Fh1XB)-$>z-Tn8RnyCI0e(LokHh712?PQ4K3u$d5daLpj&G}Y z0;EE~dl3K*J)2_$fX&(EXcGr;DA^n%4zM}99BtwN4kepo!~r&Em!nM_z@cPwj5xsN z>~ge;12~jyju8jgoL!DKaR7&s%`v$gP?s?oCvn;UOzsOD1AHz3I4{Jhah2mU0$=u| zS{ne_3P()@A#MK7v0+-wv3C`61HjQUE>F;?DQW&*1V9zL3fcg4=kEmoB-R zwE?Ilz?r}2JZxpV3b_H0u&nvJE`X|c6$%4T9T7Kw*8yN+SD`cjN%MCd048=7N&|pG zEs=!iX)SOIVPx%lu1NERCr$PnlW!0VGM>HHGA1w2`QD}7r+=2RT=2kDdMtp>{vBfy0BDPShBQH zHZo@Ep-$P#P(=wH;TM3EN=V5@_C#0tB%=$3z<1crht4+vcf$7bz4i@$*C6B9TE^=K z17HfsI00*cj0?bqptXRtK*kAJ3uIgX_7<=fkZ6Hou^9FH{gr^ro+K7uC=_5Y7yu^( zDX1a<%H=YQMk7`TD+7R9s#dE-1Y!Tr4t#!fx-jhH+mF%r&EKpFn$_wHC*?XTs?}+}+Ej*blLU@1nCI+zga0FKy z-{!@Pw*DT#j~8EJ0OudBq1|rBIZ8ob2as%mZnq0K5D7v)pQqc?;zoFLI2?|P$3cqo zq}6JPtssel@WB`0T70sMX0h+XZjAaV&@l-T(G6iVT_A!N!!O* zrT`yLMKdQ;fF^ApW0?YcJQdBHOaYp-C1a&sov|w*Z6eFSS;mvV4geRT+~$a<;85|n ziN;-|>pG1cz%sr77ZuP(so87-7N2&3$_^l{FTkbvq=x`EN@&EOHM-0Hh;4>a_ySz= zX7v!TD*#)-(HG!UJU-0nAz%kU)hyx*aH(9%Lm&o#iksyNa4jBvLwIp}2*d%*@&&j6 zkn|9U1HeM3`2t)4;PVn50u=x*#cDrm0JMqw7S9ym+lgrBlX(UF0}V-SP>6|aG5`Po O07*qoM6N<$f&c)CGC+F( literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/25-inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/25-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..b9313c246691679461898a1dc3b2f2692342b424 GIT binary patch literal 696 zcmV;p0!RIcP)Px%a7jc#RCr$PnlVqpU=W6{(OotN5>4P2z>1EHPKLTTIvV5R0E=;f!NnLyM;A++ z92u1regPz!Fu38asktUcsW<{rhD+P3kcxo z`x;(%ZZPDRX8#u#ug+$(g?May^?JRKCD3ZMTm6>y1fr*d)u~`#22CK zM>&lexgUb#IE!+ysOIrTRQE-0dSO7&5&L&rUOC`FJ;9w*8gx3HLN&c87vS}7 zx9g6_V;~5q_iX##@&I4}c6?pM6CghXJm&%6(9=0a0O*`ujy7=shmy`Q;sBkq%h4td z;84;zMjW7Xb~)O_0USy?$A|-T&MrrrIDkV*=NNH-&e`Q?69;f8=^PWw0Yw>;aT2Et zAkTe){{SBg0L}|>YMkZL1c6U`QmqVtY=xsHg0O1-&avUDnE&2Yhz$To&$v86qo%O= zdlCRy>?$Y&P@TUg01&#Xkl>z6KUD_cF9FW{J?6`1wyO{u011nlzpDbsdRHMa0KX%G z=I<&1^4L{K4M5oZT?IfMy9%iRK%qhNcU1rwpXIJXssL2Pu1l-{SeH!X^&aAYyvVQ1 ebB%Yv4Px%n@L1LRCr$PnlVcwQ4q%`Xn*MxQV5A(ASo{#ViBveIi$4jRU8dmCKCuQ3!N~MxX zr_=E1>;rsxI)-Mm2|*Byj2DKXDHe+3r~_s#c2Il;;Nz)C=A;ggr0ruYb%2kjBAJsqK$5nPvD5)Ro{D5n z>HtaFKE_f9_;@OkIjI9AY5N#U9pK}sNamytkfhBSYtqq~a|cYC$TV=K*-3B?00*M3 zmm}VTL*j7~jk8GGahh`g)9eM5-wuU7~SS~ z*d{}^djU2{yWSyi?f@(S%e?>_{myp?oC6>==MDio02DfCFTfT6zR$5kAOgTftn|AIK$^I3@zepnorrWkiFd$1G*fd> UoZdpD00000NkvXXu0mjf0D6;3egFUf literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/50-inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/50-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..dc68d72439ab96bcc2128e95bb6ce17f6691d8f1 GIT binary patch literal 702 zcmV;v0zv(WP)Px%cS%G+RCr$PnlVqpP!Pwj(OotN1{3fLz)Bq1bTZV%(a{)V;sA?rfx*NWtHF-@5rM*{bOW!-DrX212|L%XsaA$$xAIot4zyR0*h7;ft zFx&v#1i1vb1Pmv@C1AJ#_+NlafKme0YE_KKV=ZCDibC;~N(Cm92^0Z>YO*2$Nb#jo z35LU=IRG5T5$$#xF!LzB-|xpdg;Gj+#9$J8y&l-M9jamBCW>z~8t}4t1@EWdFq_R_ zFc=gHK(Gw%zfQ#A&o#KN8wz1gn03A@8W;QUym9FPcs>5~#jDm<9@)ls2G7}SHpRiy z4j_P|-y3jm-$2}b%xexDRN(b=I`ze4&H1wHu4|@$8r2}uw>2SgJj(ox#=wff{xgG*z(E&Ke8uSvPnqswOS22olc>e zUYrZ?`);=@Mxzl(2&ngL`_b|MU;uV}UByd4K?r!y13;mta|{E}IlB~X>;MWSonzPm zI%k)njU7Otq;m{AK;Rp!OVP#-pit5|CXoY* zGA5%WP8mR+`vU&~J`n(%7vj`7%cThkKJ7`hG5~2S95qP@QS*0-4WnZIdsiVb031Ez z@`M~UEt|iu0w9ZB1!VxL^Y^3xqIMOMJ~Qlh$^e2TK$*WMJZxsW3W)(oVR7?!RRCG< zDy$43=!mfSy9$6jb`??sux$RW0w9lFh139`(6ITtDgcbna#tZ$04ieFC6)oKOD6I< k2Rk4y^6TPx%s7XXYRCr$PnmJ>rKOy5V3X#!Ce4AU z*u~Pu7p%0=2qH(WOiG(ez#?#76?e9} z`auAQ142$fN+9G0kR~W4ASDoT0#X7YH-Ov%QUVkukVqs{tyY@~xYmh(I< zgg^zA1VAd4f@ZU66~fd2&?S}4W|fAp_j?t-E}RVw`{a2?9e=pD>Y#q5K6Fy1y&{vz zsAx0_A5Z6C`}GHu%VqF9Z(uy%_fIh7j9Wfyml?PY5Vp z-Ti~c&0|YEHd5>-#bS{xPqIJOAoQ)!f)I;=@B1C)fVTHM4;qa|hj^Q}2zw9c4v0-r z_XGS*_XJ(@_#N8**X|4HiFfBk?f@MypU0W?I(zbU9tUCZpz+^ALRJ`pS0_y;@pkej`OvF>|5Rd`T z;`;3cn2N`}A$-~1As`3PZ!f?E0Obw=IRF&eYcIeQ06tH#L%;&SL@f8S0)U&iYw^SZ guAK;XKB0HOe=GEVP!-?^5&!@I07*qoM6N<$f>*~(-~a#s literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/75-inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/75-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..b10d33cdb5274491988b7825717616f064dbe5e1 GIT binary patch literal 714 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c60c5299b40a925b2a092f3725282ddc3123924d GIT binary patch literal 741 zcmVPx%o=HSORCr$PnmHhCo{yb&4b+$XaR&ZE0+bilD_MT3mvtXtS{; zrKy%OhzO%e$CeZtf@-q8cyT{?@hg;k`tE%3J177A@b3G0-@7;5g&^RsP{8$r01yWR zoPd--zzrZxP)a~bAm9X~1OjdVxdo&IC`uq2jjC$3`Y+&GPZGsPA`z(7YG4xr6;u)c z@pv5S^}1CE{|10AsZ=VZG=#OgDOepiY8m#y>$2J(zqab2W~JV8Ql`BknM|s1I1Ceq zeX#Jc4W&{E(&_Y{@$&h+N+c3++Pn1)jq3DK)1L{M3il_A5ay4EJphZJJ5bs^2etRu zG-hahL?t%n;G}2M18}zV1jS;}d!7n{bpZYnD3{BC4N*fFnjMAEbbmt#C|+H?!Slt# zw|H!%*iQ5X0-Pw}B8DEL zoBR*iWXNPx%f=NU{RCr$PnlVhmP!NW%(Oo7T98AE)5hi2fCUMcpfQzG}A;!c37UKegi7~{{ z(M5=pE(SM)ae~oBNE{q=!d>&sHF>0srG2lImcDn4ctHQ}{yT^N4AA^#Xs#a!069Q& z0yF}e8-SJ|jR1{+<^*U2G&cbK7oZUk8G%eD!+O1*lCXS5q4;z<4gG!}k^n)rS)Ks6 z_*5zdolZv|0F6e2mCI$o&ZGEdv+3&;kx`1H2Af!`)u31`x@!3MCW<#r6K-cu;OXES z27>{#TCGF@u#Z9gbD!<}oI<! z%sU`hG|=|-)n`ZNld|>woW>Wq-3g_awc$7zeCF|s_}nLX>5T${j#$5(v&I2md?y%u zNpSJmY!)h&N}`sYp9}Es)oPV>yItTAP;Y7B%CG=n0d9O%#dAP*2>6}_K!l#kH3UHA z?uuw52Z&HoxrQ8|a(6|vkpo01sa!)2P`SGz+Qz^c`q;t@PPneUWlo2l<^q{A9hkL4S?GUqb3f)D}NWU zp;yhMZxsRqz~~u|CwSB}Dt{jbKoqwM(g0-h_n-j0ZWV%lr`zYG0oX@CB!3U`uuCTmCK!0PCZ?RR|S; wjM!>aXiMXDF91s`zY58649q%>V!Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-1.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000000000000000000000000000000000..87bf6f93e10f22f2102e27b7dd53d30d5bfd85f7 GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}$(}BbArbD$ zDG~_>EDn4#?y*WRVR3VY5p8uG24XAzY}fmg$dUa2&;)h6_7wh!YZ&+b+Ey9z;eW?< z8#Xs_!?ypz?mdKI;Vst1_l7) CkvMn& literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-2.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..66f681987262fcd77f560a11a772f6389683bcf6 GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}C7v#hArbD$ zDG~_>EDn4#?y*WRVR3VY5p8uG24XAzY}fmg$dUa2(1iPS4UEUm3D0+)^1LIcW&Npn zUyPpqUp3!`$Nl#5+g$>46N6o;Dc4^HYFEDn4#?y*WRVR3VY5p8uGH*B$b2+`+*hA2!nyF e6YUHPS;kU|8VAGFfi7Y2boFyt=akUIzyJWMheU<| literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-4.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000000000000000000000000000000000..215f17ad91c87d32fadbc5db2174f09b523cca33 GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6`n4RArbD$ zDG~_>EDn4#?y*WRVR3VY5p8uGH*B={&t>R!{*nCGyvD0Bn S3D6A;p00i_>zopr7#IM`hdv_! literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/meta.json new file mode 100644 index 00000000000..115d89c05a1 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/meta.json @@ -0,0 +1,77 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244, Resprited for DeltaV by Stop_Sign and bogus", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "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 + }, + { + "name": "0-inhand-left", + "directions": 4 + }, + { + "name": "0-inhand-right", + "directions": 4 + }, + { + "name": "25-inhand-left", + "directions": 4 + }, + { + "name": "25-inhand-right", + "directions": 4 + }, + { + "name": "50-inhand-left", + "directions": 4 + }, + { + "name": "50-inhand-right", + "directions": 4 + }, + { + "name": "75-inhand-left", + "directions": 4 + }, + { + "name": "75-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi/heal_bolt.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi/heal_bolt.png new file mode 100644 index 0000000000000000000000000000000000000000..7f54eb20d0dc41c5e624065f9576305eda633f9c GIT binary patch literal 351 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zB|TjnLn`9l zPF={$6e!^GU4+Ai&!1nyiCII-LD)+%L(AbJ!@a_#O7O$s{{^j63k-Yoy5H}g&X z?`L(wN9Qm5@spWBB47@KsD>Vcy`z=`YnSi>rlYJ6#1=4xEU;kI3W#CIV?-5pa7d_* z-p8_Wqtv@gy}tZ^Wa|FQXq=PpzGo}zq}6b;^lo0=uNmb|630L4&+$HEwSWGv_HTbH zw|LIB)_q|eo5@_Ks9}}xkv~8tX6DQ|#-|&)au_sLSfwU4T;3+KIjNy(Rj?YHMXtA@ gHXFIZ)65_6PVtdzopr0G%a$#sB~S literal 0 HcmV?d00001 From 5b5bd0963d542585558c438c9fd808c78e250294 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Thu, 14 Nov 2024 19:35:44 -0600 Subject: [PATCH 02/16] Fix the meta.json things --- .../Weapons/Guns/Battery/heal_gun.rsi/meta.json | 2 +- .../Guns/Projectiles/projectiles.rsi/meta.json | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/meta.json index 115d89c05a1..6ef88bbe82c 100644 --- a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244, Resprited for DeltaV by Stop_Sign and bogus", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244,Edited for DeltaV by Stop_Sign and bogus", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json new file mode 100644 index 00000000000..7980204eca3 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited for Delta-V by Stop-Sign", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "heal_bolt" + } + ] +} From 60aa7be7ccecc849d1db5de6ec078fd64ad895fd Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Thu, 14 Nov 2024 20:20:15 -0600 Subject: [PATCH 03/16] Update projectiles.yml --- .../Weapons/Guns/Projectiles/projectiles.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index c655c73097f..5a9b86d0f09 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -14,22 +14,14 @@ volume: 5 - type: Sprite sprite: DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi + layers: + - state: heal_bolt - type: Ammo - type: Physics - - type: Fixtures - fixtures: - projectile: - shape: - !type:PhysShapeAabb - bounds: "-0.2,-0.2,0.2,0.2" - hard: false - mask: - - Opaque - fly-by: *flybyfixture - type: Projectile damage: groups: Brute: -5 Burn: -5 Airloss: -5 - ignoreResistances: true \ No newline at end of file + ignoreResistances: true From 189d42a2184573bc7797f273f5df7c1620292c2e Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Thu, 14 Nov 2024 20:32:06 -0600 Subject: [PATCH 04/16] Update heal_bolt.png --- .../Projectiles/projectiles.rsi/heal_bolt.png | Bin 351 -> 339 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi/heal_bolt.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi/heal_bolt.png index 7f54eb20d0dc41c5e624065f9576305eda633f9c..b3cf0f6b06540e174f0e87fd7eb7c74c91697de5 100644 GIT binary patch delta 299 zcmcc5beU;_VLh*>i(^Pd+}oLoLWcr)TR*aSA7&99sjt|s#REG(t)2_rPtrDym`*<>4rTmPXbQXPiJ3$^g7ETR}SF> z+niH-_qGN%Fuc+Y&}CqZXpnqh%kus3qAzc6mvbvHup}_1F*r}qP1wV>lXV9W?#X9N zYxvExp;lxr*Y-NG^>erXGh9^H@mJjcpU%9MKQzTzPFxc#wG&tnW)p40ft{^_B2mp$ Y7k~PVqutkQ-3&nB>FVdQ&MBb@0OTipGXMYp literal 351 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zB|TjnLn`9l zPF={$6e!^GU4+Ai&!1nyiCII-LD)+%L(AbJ!@a_#O7O$s{{^j63k-Yoy5H}g&X z?`L(wN9Qm5@spWBB47@KsD>Vcy`z=`YnSi>rlYJ6#1=4xEU;kI3W#CIV?-5pa7d_* z-p8_Wqtv@gy}tZ^Wa|FQXq=PpzGo}zq}6b;^lo0=uNmb|630L4&+$HEwSWGv_HTbH zw|LIB)_q|eo5@_Ks9}}xkv~8tX6DQ|#-|&)au_sLSfwU4T;3+KIjNy(Rj?YHMXtA@ gHXFIZ)65_6PVtdzopr0G%a$#sB~S From 53f3abc8e53521c97de4b10e926a73cec8f9822a Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Fri, 15 Nov 2024 08:46:33 -0600 Subject: [PATCH 05/16] Update projectiles.yml --- .../Objects/Weapons/Guns/Projectiles/projectiles.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 5a9b86d0f09..e42ae505b21 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -21,7 +21,7 @@ - type: Projectile damage: groups: - Brute: -5 - Burn: -5 - Airloss: -5 + Brute: -15 + Burn: -10 + Airloss: -15 ignoreResistances: true From 6dbf6ea165091432cd2686f28a39e853a364f5ae Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Fri, 15 Nov 2024 09:23:57 -0600 Subject: [PATCH 06/16] Fuck custom Sprites --- .../Weapons/Guns/Projectiles/projectiles.yml | 6 ++++-- .../Guns/Battery/heal_gun.rsi/mag-unshaded-0.png | Bin 0 -> 147 bytes .../Weapons/Guns/Battery/heal_gun.rsi/meta.json | 3 +++ .../Projectiles/projectiles.rsi/heal_bolt.png | Bin 339 -> 0 bytes .../Guns/Projectiles/projectiles.rsi/meta.json | 14 -------------- 5 files changed, 7 insertions(+), 16 deletions(-) create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-0.png delete mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi/heal_bolt.png delete mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index e42ae505b21..a1120dfe7da 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -13,9 +13,11 @@ params: volume: 5 - type: Sprite - sprite: DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi layers: - - state: heal_bolt + - state: omnilaser_greyscale + shader: unshaded + color: green - type: Ammo - type: Physics - type: Projectile diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-0.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000000000000000000000000000000000..6be3d0816f3e0be8860007027d8a355521915a41 GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}KAtX)ArbCx zuWjT7s&WauG2@tK&W#AQ3vQFTpKWF+U(aa%aYw~|K?X(^0SAUgdlt7NR-;yTn7t8*aDAo2Hasd>{*Z@;5v2X53!vm&+Lm+IQcBs z=x1)%&+9X;#|tnpoe@32^o+rPWg~-_K{x~V4CVu32bdxb#4ze4@HyNOdol0$$BkC4 z!V;4X{M;(N{(j}nb9PTR>}h!taB@2P`lHub7P)c=C)nnk+Pk+kxPjr7Zh$TWV?=}G z16!8whZlW$d%K)lfq^A~F^$1_f^Nbdww Date: Fri, 15 Nov 2024 14:08:13 -0600 Subject: [PATCH 07/16] Finishing up --- Resources/Locale/en-US/research/technologies.ftl | 1 + .../Objects/Weapons/Guns/Battery/battery_guns.yml | 2 +- .../Prototypes/DeltaV/Recipes/Lathes/medical.yml | 9 +++++++++ .../Prototypes/DeltaV/Recipes/Lathes/security.yml | 8 ++++++++ Resources/Prototypes/DeltaV/Research/experimental.yml | 11 +++++++++++ .../Prototypes/Entities/Structures/Machines/lathe.yml | 2 ++ 6 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/DeltaV/Research/experimental.yml diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl index 0b0970ec08f..4d9ba4eceaf 100644 --- a/Resources/Locale/en-US/research/technologies.ftl +++ b/Resources/Locale/en-US/research/technologies.ftl @@ -52,6 +52,7 @@ research-technology-advanced-anomaly-research = Advanced Anomaly Research research-technology-rped = Rapid Part Exchange research-technology-super-parts = Super Parts research-technology-deterrence = Deterrence Technologies +research-technology-biopulse-emitter = Bio-Pulse Emitter research-technology-janitorial-equipment = Janitorial Equipment research-technology-laundry-tech = Laundry Tech diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 40e254ebd6e..0a4e68d59d5 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -297,4 +297,4 @@ magState: mag steps: 5 zeroVisible: true - - type: Appearance \ No newline at end of file + - type: Appearance diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml index 945829974eb..973e768052a 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml @@ -22,3 +22,12 @@ materials: Plastic: 150 Steel: 50 + +- type: latheRecipe + id: WeaponHealGun + result: WeaponHealGun + completetime: 1.5 + materials: + Plastic: 1000 + Glass: 500 + Steel: 750 diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml index 02b2ef0f5ca..8bae98888be 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml @@ -224,3 +224,11 @@ Steel: 1000 Plastic: 800 +- type: latheRecipe + id: WeaponHealGun + result: WeaponHealGun + completetime: 1.5 + materials: + Plastic: 1000 + Glass: 500 + Steel: 750 diff --git a/Resources/Prototypes/DeltaV/Research/experimental.yml b/Resources/Prototypes/DeltaV/Research/experimental.yml new file mode 100644 index 00000000000..c5c3c265f51 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Research/experimental.yml @@ -0,0 +1,11 @@ +- type: technology + id: BioPulseEmitter + name: research-technology-biopulse-emitter + icon: + sprite: DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi + state: icon + discipline: Experimental + tier: 3 + cost: 10000 + recipeUnlocks: + - WeaponHealGun diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 6761b7f1812..3df276601f6 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -943,6 +943,7 @@ - ClothingOuterHardsuitSyndieReverseEngineered - ClothingShoesBootsSecurityMagboots - AdvancedTruncheon + - WeaponHealGun # End DeltaV additions - type: MaterialStorage whitelist: @@ -1071,6 +1072,7 @@ # Begin DeltaV additions - LauncherSyringe - MiniSyringe + - WeaponHealGun # End DeltaV additions - ChemicalPayload - CryostasisBeaker From 897e596fb5479a40f46bb0faf540eaae5dc03b57 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Fri, 15 Nov 2024 14:20:47 -0600 Subject: [PATCH 08/16] Fix YML please --- Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml index 8bae98888be..4b532139068 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml @@ -223,12 +223,3 @@ materials: Steel: 1000 Plastic: 800 - -- type: latheRecipe - id: WeaponHealGun - result: WeaponHealGun - completetime: 1.5 - materials: - Plastic: 1000 - Glass: 500 - Steel: 750 From 1a13ad753fde835e65d66134ea263e13ab08aab3 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Fri, 22 Nov 2024 08:42:01 -0600 Subject: [PATCH 09/16] Meow --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 4 ++-- Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 0a4e68d59d5..f9ab1202b1c 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -266,7 +266,7 @@ name: Medi-Cannon parent: BaseWeaponBattery id: WeaponHealGun - description: "A 20 round semi-automatic laser carbine." + description: "A high-tech firearm that shoots specialized healing projectiles." components: - type: Sprite sprite: DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi @@ -284,7 +284,7 @@ soundEmpty: path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg selectedMode: SemiAuto - fireRate: 3 + fireRate: 2 availableModes: - SemiAuto - type: Battery diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml index 973e768052a..80ae57929f8 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml @@ -31,3 +31,4 @@ Plastic: 1000 Glass: 500 Steel: 750 + Gold: 100 From bf6ac92836257d176e2032debdea4a2014d0346a Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Tue, 26 Nov 2024 17:21:54 -0600 Subject: [PATCH 10/16] Requested things --- Resources/Locale/en-US/deltav/research/technologies.ftl | 1 + Resources/Locale/en-US/research/technologies.ftl | 1 - .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 2 +- .../Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/deltav/research/technologies.ftl b/Resources/Locale/en-US/deltav/research/technologies.ftl index ae1a8fe69ab..e26eb2c2d3b 100644 --- a/Resources/Locale/en-US/deltav/research/technologies.ftl +++ b/Resources/Locale/en-US/deltav/research/technologies.ftl @@ -6,3 +6,4 @@ research-technology-energy-gun-advance = Advanced Energy Manipulation research-technology-advance-laser = Advanced Laser Manipulation research-technology-robust-melee = Robust Melee research-technology-syringe-gun = Syringe Gun +research-technology-biopulse-emitter = Bio-Pulse Emitter diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl index 4d9ba4eceaf..0b0970ec08f 100644 --- a/Resources/Locale/en-US/research/technologies.ftl +++ b/Resources/Locale/en-US/research/technologies.ftl @@ -52,7 +52,6 @@ research-technology-advanced-anomaly-research = Advanced Anomaly Research research-technology-rped = Rapid Part Exchange research-technology-super-parts = Super Parts research-technology-deterrence = Deterrence Technologies -research-technology-biopulse-emitter = Bio-Pulse Emitter research-technology-janitorial-equipment = Janitorial Equipment research-technology-laundry-tech = Laundry Tech diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index f9ab1202b1c..7edbaef33ca 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -263,9 +263,9 @@ - type: Appearance - type: entity - name: Medi-Cannon parent: BaseWeaponBattery id: WeaponHealGun + name: Medi-Cannon description: "A high-tech firearm that shoots specialized healing projectiles." components: - type: Sprite diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index a1120dfe7da..d3b9e474fcc 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -1,7 +1,7 @@ - type: entity - name: heal bolt - id: BulletHealLaser parent: BaseBullet + id: BulletHealLaser + name: heal bolt categories: [ HideSpawnMenu ] components: - type: Reflective From 43cb1b17f677cea468463ce154debcba831a88b5 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Tue, 26 Nov 2024 22:27:15 -0600 Subject: [PATCH 11/16] Update security.yml Signed-off-by: Stop-Signs --- Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml index 4b532139068..2a4ac253155 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml @@ -223,3 +223,4 @@ materials: Steel: 1000 Plastic: 800 + From 77449eac13ea4f0eb8170f9691ef32fd826d20b5 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Tue, 26 Nov 2024 22:27:57 -0600 Subject: [PATCH 12/16] Update security.yml Signed-off-by: Stop-Signs --- Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml index 2a4ac253155..6aec409a708 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml @@ -224,3 +224,4 @@ Steel: 1000 Plastic: 800 + From 34689d7d8166dec25e1c1088705709481bff4556 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Tue, 26 Nov 2024 22:29:02 -0600 Subject: [PATCH 13/16] Revert "Fix YML please" This reverts commit 897e596fb5479a40f46bb0faf540eaae5dc03b57. --- Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml index 4b532139068..8bae98888be 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml @@ -223,3 +223,12 @@ materials: Steel: 1000 Plastic: 800 + +- type: latheRecipe + id: WeaponHealGun + result: WeaponHealGun + completetime: 1.5 + materials: + Plastic: 1000 + Glass: 500 + Steel: 750 From 66d7ab835c2c1704c6935d3faff685493f4ecc9f Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Tue, 26 Nov 2024 22:30:20 -0600 Subject: [PATCH 14/16] i have no idea why its not untouching --- Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml index 8bae98888be..02b2ef0f5ca 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml @@ -224,11 +224,3 @@ Steel: 1000 Plastic: 800 -- type: latheRecipe - id: WeaponHealGun - result: WeaponHealGun - completetime: 1.5 - materials: - Plastic: 1000 - Glass: 500 - Steel: 750 From b2bf0349a785f9d9bc5a75236b74e502abbd8e92 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Wed, 27 Nov 2024 09:50:52 -0600 Subject: [PATCH 15/16] Delta Changes --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 2 +- Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 7edbaef33ca..a21389a1e0d 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -265,7 +265,7 @@ - type: entity parent: BaseWeaponBattery id: WeaponHealGun - name: Medi-Cannon + name: Medi-Beam description: "A high-tech firearm that shoots specialized healing projectiles." components: - type: Sprite diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml index 80ae57929f8..8c2a8864916 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml @@ -24,9 +24,9 @@ Steel: 50 - type: latheRecipe + parent: BaseWeaponRecipe id: WeaponHealGun result: WeaponHealGun - completetime: 1.5 materials: Plastic: 1000 Glass: 500 From 650c14b105c8cc3e98ef53aff37275b12c490365 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Thu, 28 Nov 2024 12:11:01 -0600 Subject: [PATCH 16/16] Projectile color changed --- .../Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index d3b9e474fcc..987f23c0144 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -17,7 +17,7 @@ layers: - state: omnilaser_greyscale shader: unshaded - color: green + color: mediumseagreen - type: Ammo - type: Physics - type: Projectile