From ab560b69766ac8bbd35f345f14d49465822087d4 Mon Sep 17 00:00:00 2001 From: TaralGit <76408146+TaralGit@users.noreply.github.com> Date: Tue, 17 Jan 2023 20:08:36 +0200 Subject: [PATCH] Cult weapons (#13414) Co-authored-by: and_a --- .../Entities/Objects/Weapons/Melee/cult.yml | 80 ++++++++++++++++++ .../Weapons/Melee/cult_blade.rsi/icon.png | Bin 0 -> 400 bytes .../Melee/cult_blade.rsi/inhand-left.png | Bin 0 -> 299 bytes .../Melee/cult_blade.rsi/inhand-right.png | Bin 0 -> 281 bytes .../Weapons/Melee/cult_blade.rsi/meta.json | 22 +++++ .../Weapons/Melee/cult_dagger.rsi/icon.png | Bin 0 -> 814 bytes .../Melee/cult_dagger.rsi/inhand-left.png | Bin 0 -> 251 bytes .../Melee/cult_dagger.rsi/inhand-right.png | Bin 0 -> 250 bytes .../Weapons/Melee/cult_dagger.rsi/meta.json | 22 +++++ .../Weapons/Melee/cult_halberd.rsi/icon.png | Bin 0 -> 304 bytes .../Melee/cult_halberd.rsi/inhand-left.png | Bin 0 -> 303 bytes .../Melee/cult_halberd.rsi/inhand-right.png | Bin 0 -> 300 bytes .../Weapons/Melee/cult_halberd.rsi/meta.json | 30 +++++++ .../cult_halberd.rsi/wielded-inhand-left.png | Bin 0 -> 342 bytes .../cult_halberd.rsi/wielded-inhand-right.png | Bin 0 -> 333 bytes 15 files changed, 154 insertions(+) create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml create mode 100644 Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/wielded-inhand-right.png diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml new file mode 100644 index 0000000000..3061e29e11 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml @@ -0,0 +1,80 @@ +- type: entity + name: ritual dagger + parent: BaseItem + id: RitualDagger + description: A strange dagger used by sinister groups for rituals and sacrifices. + components: + - type: Sharp + - type: Sprite + sprite: Objects/Weapons/Melee/cult_dagger.rsi + state: icon + - type: MeleeWeapon + attackRate: 1.5 + damage: + types: + Slash: 12 + - type: Item + size: 20 + - type: Clothing + sprite: Objects/Weapons/Melee/cult_dagger.rsi + slots: + - back + - type: DisarmMalus + +- type: entity + name: eldritch blade + parent: BaseItem + id: EldritchBlade + description: A sword humming with unholy energy. + components: + - type: Sharp + - type: Sprite + sprite: Objects/Weapons/Melee/cult_blade.rsi + state: icon + - type: MeleeWeapon + attackRate: 0.75 + damage: + types: + Slash: 33 + - type: Item + size: 20 + - type: Clothing + sprite: Objects/Weapons/Melee/cult_blade.rsi + slots: + - back + - type: DisarmMalus + +- type: entity + name: unholy halberd + parent: BaseItem + id: UnholyHalberd + description: A poleaxe that seems to be linked to its wielder. + components: + - type: Tag + tags: + - FireAxe + - type: Sharp + - type: Sprite + sprite: Objects/Weapons/Melee/cult_halberd.rsi + state: icon + - type: MeleeWeapon + attackRate: 0.75 + damage: + types: + Blunt: 10 + Slash: 20 + Structural: 3 + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 4 + Slash: 12 + Structural: 30 + - type: Item + size: 150 + - type: Clothing + sprite: Objects/Weapons/Melee/cult_halberd.rsi + quickEquip: false + slots: + - back diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4dc5a3807deccfd54d97fc89ca46cb32703a205d GIT binary patch literal 400 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkP%tXMC&U#<+lfmZ-@Kv8+-ypHt)r^Cv!#W$uvkrQc6xZ|s_9cBHPk&- z)y)O@RV9QybTzaE1q0RO(ij-dFfb&k$ksbpIA~})n(EnT$afp*SQzSRD99}7Zz)cU znEhF7KhSi!k|4iehX44$7YiwKpvtA5E{-7;b6PK+7CWTC!*W4DE@+kGhA`c?|Nk$$ zP`fPWy-K>Dg41~i)uisb8{6e%?k{kEq3E(fp~b+LFXW9(>?Q5CbK&zOtT(%!vw1Bp zmG@q2e&0LmKZOrpFt?xY>Wq0aUB~F?5r5MFpQ$Ze9<`wtx#lnipH(_gY`F6UXXL#& zmoBjvpI;jUGS$}oT~N34hyJIh?9VelYtLG~O-fEd2B~lMS&r=eBAprYfevQy MboFyt=akR{01Hx`3IG5A literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..48d10b565653ef5852eebbdd300e645c82e519c1 GIT binary patch literal 299 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@31>6XFV_)5Ak+a^D$oj;D)bNX4ADQx5VrDDb#uD$L`R77$ZVxp(s*>z#To#g+pLzk2VH{I_uJug|ZS z`mbCn`S!#EJ87j`3uTL3wz%w%VB+~{A6))fu(R6s1;c$_t`k|)ym?mUItwNpxO8dF ziYd#bH!rohD`7N2KXhO6riCVwV%M(g9c-#u(agdvee1~KrkeTg5eAG*I_Ew%HXr5a lFyGK%bb)dEgAVzZY*%J*ZYWLOx&!D=22WQ%mvv4FO#l&oZ)gAj literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..92f70dcd0aa1fbcbfde085c3f6c13ce71dfb6c3c GIT binary patch literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2)*6XFV_)5Ak+ak&peS2OkY6yve-NmueDDt_ z(&y>o7*a9kZAdiN0R^7bFBsd*1@sMC{#Li&{jbOTUF6oWv-=bG9a-X8FSV#~x`D@o zYF0I-d*>AxBwbP#eD1sZ!SL~gwk=HaVyyXUG78RhC6vVQW(WyPb{(wrF zjA&x>5({l5PQ`H72*oG+3Qk9ch#myts1VVO1(GxCw=?w~Q2H_9r*V#?2uDIt_R1!p P%NRUe{an^LB{Ts5xXEGV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/meta.json new file mode 100644 index 0000000000..520fb47bb8 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/commit/115340490365e480b80adc06da54ee52aa99f653", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3dc00c1054fdcce4ee2ba4f9c831845d2da0bcfe GIT binary patch literal 814 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkP(fsXPlzi}Qk;v+PF%`JR5abpTw7R7k6&0rQX<{m$=T9EQA{+_#>_}k zMqX4X#=<1b)7?WyPo7^;NkX(Dz%M;KG+bWZT2Cv}*S$G4Nm)eH*+?(T&$A{sJ4Q*_ zQB_?_QNArZeP(Udl=@l~etunL#oQpDbITswh~fD+ieBl}3b|+q9+0+)PeHP*zwV$lM@MS64??BE;M% z#6-W)-+Os$+kv_BJXO_IC4}8n6yvQebOrg%1^KN61#L9swFL!bxVZz>6gfGi zxVY*aEF3hn9ZmH-bTyJxWV?-YG$che6l5$6b!#%>ixVRxfEGzf_*t7Ic-STTgF=aq zhpQ+$U`c;Ve`TJJow>S_ysnzEvXq#Lw0MYvg_4XEP>q?6x~L$Zl$fZ3jMU@BR~&#s z#U(+0!3_Ut4PGNzAOvDx+2Z^iX#IOn7srr_ImrnM+y+L10SC?;I@K1>YR#^$9mg7T zXO2yU=!Z`qxj7yME2!uk((iJQ^NDeCaS`fg(#({UjI_M-=@VC%m(i&mPeVgQuS~gO zT5u{`Dz1v}P3(-lb?R1Iw5PlK*+XKx_sref zym->2Ns~8omsN(FmkUZtmh$`S$9%fCPRVZHz8!PUKX~=_xx7F}u#|?p$eZ41sU`Ln zEbDFR{_-sR@zuDct@ZKM^8$jBjn^AiyqFPD^QrJ7XQ$^65tZdjmMu+x5IAAx)Vb3p lce^{r)j1{#+G%SrF-&w&^|LjaZ4dN1gQu&X%Q~loCIBMaO8Wo+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..ea8a6200a7cb50c78e998f7d972adf01d87fb916 GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND99h+6XFV_&u!Y0>S%lY^eG1oZP(<-bAdvvB|(0{4F7>Z=7Ji?_!3VS z$B>FS$q5py&LRd*hJFh;f)+S5GN~~OWVS>%Zer*VIhNTnNpVJ!$)Tl(1ig%{9t0d{ za$C&IzUEAz0hgPNfWzX8jKV%n9Wkt@4A?d^l`-=q>bR|G<(O=ADEE+8gvbVk-LWjQ l1^Fy)7%+b*a%Visz_2BURo_$G@(9p=22WQ%mvv4FO#tt_N=g6# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..bbb0c72223f7e96cda774e038c503a3b3b369eee GIT binary patch literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND99h+6XFV_&u!Y0>S%lY^eG1oZP(<-bAdvvB|(0{4F7>Z=7Ji?_+n2N z$B>FS$q5py&Kw3plafOYtaX^E!OG)i@pLB7fhh)l%2QYs^b8LzbUG<;Dxu`Sx&wm8 z5)LLZPqGM8E|_7><#w=xsVBpPEucj+Kp~iMi$TJH$OH#&X0{kswmk+1LK7^MHf|J? l(6P8-@StJ3HP;FT2APFyjK6o?X#`r&;OXk;vd$@?2>>5MOWXhe literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/meta.json new file mode 100644 index 0000000000..13ee8ef375 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/115340490365e480b80adc06da54ee52aa99f653", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f64aad494bce6ce240296f50a412bc2e489172a1 GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC}6svUW>)T-9;E=uS2=4MR0L#CDKzOE*fq6L z(AB+!VetmRNlf$B@+h6CY1_=WV&0>j&8N~WsvF*MMO+khS*(4dYn?)a3v0~_u6yKLbOSpQoyXu$zu#4@hrGkY6yv ze<(0#ntcT*IK$J$F{ENna)JbFvyg$7q=A7p=Yv4SH#!+f9p^g?iVr>tvH7%y*R|=D z4C4+_mkruR9HLtu88*Z=G;Uj6E3(r6``22a8yP%Z{an^LB{Ts5vTk6U literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..f21ece7ce7cbea83560f7d82bb667aeeda74732b GIT binary patch literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@3A^6XFV_1J&fF)YqQdw8cX}BFoS7KLdk}hPcA)N(;y37$&~){3m6Ej$V-hDX_YngSin z8&)4+5EWBs*o;IaOfC?WSa66bN2rg9IVhsx?SZ(216NmG|43og8c1s)Bi!-jW zcy6Y-jr)uBZZr%~8RA|(;=i|NlFjlAAKjkgf zGdKF?->+{uq*EJT6t6J-=-LTk^=0>0WU($k!gk@n1&i*EeJZYn22EU3*_CGm7h0%& aWVd(dmtntkXo>~UD-52lelF{r5}E*ViGP9s literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d6dd8b4773abff82805765385ded29d045840de8 GIT binary patch literal 333 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?4j zBOuH;Rhv&5C@3A^6XFV_&u!W=rM@;$P0mI`{yzhQhk%5tgm9Lhr}*jjoglp>L4Lsu z|DnK~Y4#PM;5JVe$B>FSZ>MbJI%FWw_J4|(Oz`~$rG+8~FBu+olt1A9ft88txyIW` z$FBuNRSO#LG`&CJ$@%~CJD)PCTO?`wVW64gYuQ&b5%kC8~n#TC; zZ1L@CbIWomZ&{Pg)$*ZNB}-TE+>yBOC(^xZ;Yp=isY)A-ni>Ptcv9R~?mt!`ahG+r zmBs@1V6NKNN0g65X107YdhZg>;b44$rjF6*2Ung9`3fd&8o literal 0 HcmV?d00001