From aea474d4a9a26f71367fe399e0ff813f8a9266ee Mon Sep 17 00:00:00 2001 From: RedBookcase Date: Sun, 20 Apr 2025 13:55:42 -0700 Subject: [PATCH] Pirate Gear Tweaks. (#35986) * Tweaked pirate gear to be in-line with similar items. * Added attribution for flashlight sprites, made hardsuits Major Contraband * Added empty versions of the pirate revolver and flintlock. * Test fail fix hopefully? * Test fail fix hopefully V2.0 * Test fail fix hopefully V3.0 * Test fail fix hopefully V4.0 --------- Co-authored-by: RedBookcase --- .../Clothing/Head/hardsuit-helmets.yml | 13 ++++- .../Clothing/OuterClothing/hardsuits.yml | 8 ++- .../Weapons/Guns/Revolvers/revolvers.yml | 16 +++++- .../Objects/Weapons/Guns/Snipers/snipers.yml | 24 ++++++--- .../equipped-HELMET-vox.png | Bin 4235 -> 0 bytes .../piratecaptainhelm.rsi/icon-flash.png | Bin 0 -> 470 bytes .../Hardsuits/piratecaptainhelm.rsi/meta.json | 49 +++++++++++------- .../off-equipped-HELMET-vox.png | Bin 0 -> 1103 bytes ...ped-HELMET.png => off-equipped-HELMET.png} | Bin .../on-equipped-HELMET-vox.png | Bin 0 -> 1077 bytes .../on-equipped-HELMET.png | Bin 0 -> 1234 bytes 11 files changed, 81 insertions(+), 29 deletions(-) delete mode 100644 Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/equipped-HELMET-vox.png create mode 100644 Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/icon-flash.png create mode 100644 Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/off-equipped-HELMET-vox.png rename Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/{equipped-HELMET.png => off-equipped-HELMET.png} (100%) create mode 100644 Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/on-equipped-HELMET-vox.png create mode 100644 Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/on-equipped-HELMET.png diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index acb1db120d..9aa0e76a54 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -580,7 +580,7 @@ #Pirate Captain Hardsuit - type: entity - parent: ClothingHeadHardsuitBase + parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ] id: ClothingHeadHelmetHardsuitPirateCap name: pirate captain's hardsuit helmet suffix: Pirate @@ -590,9 +590,20 @@ sprite: Clothing/Head/Hardsuits/piratecaptainhelm.rsi - type: Clothing sprite: Clothing/Head/Hardsuits/piratecaptainhelm.rsi + - type: PointLight # Color matches visor colors, radius/energy same as mining hardsuit for the big captain. + color: "#f3ea9c" + radius: 7 + energy: 3 - type: PressureProtection highPressureMultiplier: 0.3 lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 #CENTCOMM / ERT HARDSUITS #ERT Leader Hardsuit diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index f3edb201e4..ec9b5e7f06 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -751,7 +751,7 @@ #Pirate EVA Suit (Deep Space EVA Suit) #Despite visually appearing like a softsuit, it functions exactly like a hardsuit would (parents off of base hardsuit, has resistances and toggleable clothing, etc.) so it goes here. - type: entity - parent: ClothingOuterHardsuitBase + parent: [ ClothingOuterHardsuitBase, BaseMajorContraband ] id: ClothingOuterHardsuitPirateEVA name: deep space EVA suit suffix: Pirate @@ -759,6 +759,8 @@ components: - type: Sprite sprite: Clothing/OuterClothing/Hardsuits/pirateeva.rsi + - type: Item + size: Huge - type: Clothing sprite: Clothing/OuterClothing/Hardsuits/pirateeva.rsi - type: ExplosionResistance @@ -782,13 +784,15 @@ #Pirate Captain Hardsuit - type: entity - parent: ClothingOuterHardsuitBase + parent: [ ClothingOuterHardsuitBase, BaseMajorContraband ] id: ClothingOuterHardsuitPirateCap name: pirate captain's hardsuit description: An ancient armored hardsuit, perfect for defending against space scurvy and toolbox-wielding scallywags. components: - type: Sprite sprite: Clothing/OuterClothing/Hardsuits/piratecaptain.rsi + - type: Item + size: Huge - type: Clothing sprite: Clothing/OuterClothing/Hardsuits/piratecaptain.rsi - type: PressureProtection diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 18f0d1c109..fa65aa4649 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -151,7 +151,7 @@ - type: entity name: pirate revolver - parent: [BaseWeaponRevolver, BaseMinorContraband] + parent: [BaseWeaponRevolver, BaseMajorContraband] id: WeaponRevolverPirate description: A crude single-action revolver handmade by a space pirate. Old and covered in rust, it somehow still works. Loads 5 rounds of .45 magnum. components: @@ -168,3 +168,17 @@ capacity: 5 chambers: [ True, True, True, True, True ] ammoSlots: [ null, null, null, null, null ] + +- type: entity + name: pirate revolver + parent: WeaponRevolverPirate + id: WeaponRevolverPirateEmpty + description: An odd, old-looking revolver, favoured by pirate crews. Uses .45 magnum ammo. + suffix: Empty + components: + - type: RevolverAmmoProvider + proto: null + capacity: 5 + chambers: [ null, null, null, null, null ] + ammoSlots: [ null, null, null, null, null ] + diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index e8f26cac89..ff532c94bf 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -81,7 +81,7 @@ - type: entity name: musket - parent: [ BaseWeaponSniper, BaseGunWieldable, BaseMinorContraband ] + parent: [ BaseWeaponSniper, BaseGunWieldable, BaseMajorContraband ] id: Musket description: This should've been in a museum long before you were born. Uses .60 anti-materiel ammo. components: @@ -119,16 +119,19 @@ - type: entity name: flintlock pistol - parent: [BaseWeaponSniper, BaseMinorContraband] + parent: [BaseWeaponSniper, BaseMajorContraband] id: WeaponPistolFlintlock - description: A pirate's companion. Yarrr! Uses .60 anti-materiel ammo. + description: A pirate's companion. Yarrr! Uses .45 magnum ammo. components: - type: Gun minAngle: 0 maxAngle: 30 #miss him entirely because the barrel is smoothbore - type: Item size: Small - storedRotation: 90 + shape: + - 0,0,1,0 + - 0,1,0,1 + storedRotation: 0 - type: Sprite sprite: Objects/Weapons/Guns/Snipers/flintlock.rsi - type: Clothing @@ -139,9 +142,18 @@ - type: BallisticAmmoProvider whitelist: tags: - - CartridgeAntiMateriel + - CartridgeMagnum # changed from Anti-material rifle rounds because it's a flintlock pistol not a Hristov capacity: 1 - proto: CartridgeAntiMateriel + proto: CartridgeMagnum - type: StaticPrice price: 0 +- type: entity + name: flintlock pistol + parent: WeaponPistolFlintlock + id: WeaponPistolFlintlockEmpty + description: A pirate's companion. Yarrr! Uses .45 magnum ammo. + suffix: Empty + components: + - type: BallisticAmmoProvider + proto: null diff --git a/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/equipped-HELMET-vox.png deleted file mode 100644 index 8d0cd093f3bd4754fafb205ba4fb45b4dc5b6d1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4235 zcmcgv4{Q_H8NZ}~K+-@V8>(ok9R^0a=6vt|`)-a&;v^7?Sx7Pw)ClqJ?wxbQ_PM?b zaaf_D-MT_G&?1d(q1(E)Q?&^gl{QV=Xh#a_GJ%*{(W(2Rc3niXwL{xFm1X=<_ReP; zJ9SvZ(5%>(``-8czVChi-uDi4ZrM;%wX%vJh?Gll_0ik21S! zLkn@@Lfv2ROGUIf(o7I99j?9(7vT3bott~wMn*<-U7wkm35Ua&*3i%}@zbV%zW>aJ zmxd=V_O4j50ux8y_{~4?<8G&GOE>1seTe1nT)2Sgi<29-+XPWv>we3Kv1jfjh$ZXH zo?fRnvRTorxF714iu~z#5_1zoaD6%nwE^UiDvFwkM&I9l{tF*z>W#i_LIgyTVbpJK z+>=7xd$#mwdj>RF_pJ}rR0Y!tMu;N^lIeIXVJqoIUj|sg|GQ+`M`l=@fkt1mtC8%D zbdq5!g-F3KQW_8?Qj-0QAW6K`K(c@lXu#1Npjb}ffx@$7_T$6qNHUnx4W+BKJ*y7C zHTwD;C#lf%(9n>7i1S;iD9y;SOaqo?SqgJd_He?1X)0l__CT^Qt;p6=X3{aO1nI&; z)f#jfeb{1eEAeC=J7H)2g*`{7VUlM2z};GgQP=W($-z`CV}Y*GD2C!F;n< z!i$9n1)RkQIK_47znrq$90-DGS|XvoF^u=8Qb)KelS+_J(S8nP8A}1M!EK?kS9K|q5 zrywgBl#Cc%gS^N9T?*1}O<{)UO+k%-cfupNktzoRwe?#RTh;doJ&RgtAQ0YXYJc#e`)15vEV zs{xVap%KtB{j*p+SI$}BoMsGMx~O@;2V_wc+zgq!S9n$yfX!0#xs-{=5*RDs$VEnA z1Rbgdpb!)#%D_IPpdsMRKnVgVpyOV}FJ?lxJt^~mf;M+6l#v*!(~1vx(8S+R)}08^Z!R@+i>@7yLx^lavQELF=qVV zU7gQLtsf?$NDtAugv=5COJKZM6;?*B%w`u+&>bBWTzoi7V5S6cMShHyQ|EE_y0sJ= z%y3IAz#p1%f3t#x%f*7*Z!K83Tr7A~?(+%L3E?iBF>w|-FXPU*-Z0jUuTCf=3IZnt z>DlCB{!TNEV!f><9>#396^MAC$w`mYH}%7J78ns{$-<+_R~t#Whxz5`SDU);oe z=ig`94<23f8>HvZyq;^8ly`t5V~#cKwS19MuF<#6$lrs*$?UoPMI%{9Lyb_|Q>NB6ybVrlA&)=Kcl_g)`;;?)bkD|_2doR`kL zcC6#E>4(R!RgFCT_-p>8mA>?c*C($odxEV!m5hFQhOFzmQNHzHyMNPH)8}@*Fj-Mo zfBC?<;kv1ve`eap$_I|UyI|Rqrx#eych`uZZST7ySErvIL7!S(*=J8w1A0GNeb@Tx z&sgzYoR4aAtwkzd}rw?y4${#&={i8=-Twr`;k4p{X%NIR#vf|ap ds(0NeJKXZ!v87XQE^}}49c^1$PqgfO{6F>mGXMYp diff --git a/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/icon-flash.png new file mode 100644 index 0000000000000000000000000000000000000000..a99dc4586fabb8e8308b5c91a9abe05a9aa7ee62 GIT binary patch literal 470 zcmV;{0V)28P)PFcgLl#!;g#_bv?LXuvqK+zA%nzz2}`fHyF% zkhuB=Cgw7j`v|xi78YELadfEt8`{8y+!kYEOxlD%%jx;Q^PiT;4(ot*z&h~94mdh} z#@Hw%%QDt9jaqkIm(n!V=9<#dZt4T{h4VaD`I00N-#-B{29V-)UDJBKCdY9IaPl3; zF?pURK#HQ!=9TpOx)wlqv)Smv#DBnHL{Y?6tCdk(w4}c8j}HMCsj5m<9|XZ9Adle& zX(e_S#{m!kh{40{S7YkG*feo~x7Ft0F>WojZA*_20%|a>u3u=mTvAz6mouFtnZi65PKbi9bwgE^o8hq%rWqtvDV&f(%lRESDH-fLoCuR;KC%%uZ}lMa{= zm;$JzVHge|AfDYG5Z1dfr>!&xK=c<^tq+09F|gkC-=uK!7#yVX>5iU*OSuV$k#*No zyfL5ZyU8ukk|2q9dPeu>7yVcvxOGKGxqbyeOK1bE1J(iSz<+n(8*shEi**)~k^lez M07*qoM6N<$f)v!zQUCw| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/meta.json index 48f0cbb615..dd030ae1f8 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/meta.json @@ -1,22 +1,33 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github) for ss14. Vox states by Flareguy for Space Station 14", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by brainfood1183 (github) for ss14. Vox states by Flareguy for Space Station 14. Flashlight state sprites by RedBookcase on github.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-HELMET", - "directions": 4 - }, - { - "name": "equipped-HELMET-vox", - "directions": 4 - } - ] + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vox", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..2cec554e8f51999ddf342bfae8834e79f06f40c3 GIT binary patch literal 1103 zcmV-V1hD&wP)xq&u|NLO9|>LRfL|bx%0{~smok_lInZ!$5bc%gf{h1J4njzoVl)3?-!hJ?&WtO`g*R}lw>R_t z@BQZOtlWEn@EFZzGn`JR@yc8-C*-}r!<5$&=$i|D^_`s718=w6u@CinU47m)2wfjq zG-xw?^sNDq_+&B>yha#WPE1x=@jsf~{t^*2t43@$-H`qRMUkT7g*TQCr@m}1WcBkL(TamYk+L#kUKeC^=T>HCqT(%R#U-OPAKY6Qy-!GJv z1Hs+LBK-YLeZCqG1RxB)yb|{^r)fh_`Y%q-)IqC1??i&`e>gjF(zgWw9km0MVdxQWm%d??g&J2e1Rf;ZW^3GJ=BN;q$M9QkiHDUu~b=Qm-Zb zbp!~uuN{{yUo$u9)$9|Cw>xkEJE5-8kGHYgyfE=g(rpfieP;qpfC(@GCcp%k025#W zOn?b60Vco%m;e*_-wAB}k3_vz?^~mHg`B45Rshm$RIr7Rwx$;VazbxRFzfVappZpV zFZ(78S%?j(34{KI%8;&)`#u@ymuA7iG@Qre0OK5 zVZm%r7@i-fSW8bYd^Oa1X-8>EI}7ZnQNqx5)^c7TOVnYb(GchxLO~LBd-MaKblrWo zFZT8xsnR(H%I4SC-@PFq_#}I^mshF`PTDAzq9>`?9Os#A0}bq14cz&7cm;&j?Z z$Tk0q> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/off-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/off-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..2e34340b43b5ff61bacf7d794a86e555ffd63ca7 GIT binary patch literal 1077 zcmV-51j_q~P)#|&6ce#u{=j;q~-@ELd|2e-scki2b zP9y?Gx7&?ZtCe0^C=`Ue7X_FKS^|B0VW_^B(`MlPeqa00ZnxFX=LTWwLyHD&Mu@&M z01{s=mtr&;i71Lh9LM_FXf#BzSX4d@1_Niit|?$=9RW8pF=P{tIttpwd}iZ3n}0=qLFkDbW7L~YH9p`X}KU2c5u9GC0F_~&LIp4Z;0;2%6His;@G?L_?R ztN3xV6oBw)@ zKqoB=e1rEQWu61rf!S=Pb{rW&!JqN@H$kaPv`46R$Zo0ElKDCU1lQM&&z2vUoAzoB zi6z(_IDnl{*W?py>^3h<{Uhl%2gJTJ0Vco%m;e)C0!)AjFaajO1egF5U;<2l3Hf?S$26{PYmddFvVAkrXT7wc52I>W;LO}4OMP>LjO{+BS9GCONguGL&o}5W~2z)iR z5&!@w@O`}jA$Qw0N>@+Oc4GP~D7b@1rrRz`) zwO-m$TGGxIJ8G1$biK8_7swKI-05@#`i4-DMBN_!04QC5p44`F2T(c>g@EAAGCcJm zJgZGq8Jx6HEJaUJuh+wUubA$Hq$EyX2tpXa%hOkzL8Am5#Xv&^O6U9fj1FmI4c5X2 z1_e)Rpb2dX-hKtc{R!NfC(@GCcp%k025#Wf1ki_webIVLU8t100000NkvXXu0mjfQQ_Gw literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/on-equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..ea09bb593ff9c34871362cd3875a234febd7d0ba GIT binary patch literal 1234 zcmV;@1TFiCP)i3JTNmRQr67>>k{7#l0jl3a6=aE(#vEXMgB^M<*-*`3|n#lpNvE*!fv^S$?b zZ)TEvlc-43T2J)ocDs5w9J=StW)t6&t*xzzzDbhABy!(p=?4Z)r60A19fH?6?ItK1% zVkihP{hP7;gz)k4ajYA?2OQh98K=yWhyspH9MWgdzVob&zvt)Yv~G*&M-7~xpP$?W z%;YC0CocN!c01^Y>0<&Am54FW#s=4CZf-8Kzj55X>-YP}(5QYi1F*T7$$}7ge}GuJ z8KWzEjybotw-fUT>H`KlowfnvVr22YP$y37<>h4({P6xNA}q4{vaeuJuh%O(Z?2sT z*@RL<-_9Q#!|xG!w;4q;ut)}AF8zD-Ry|+ZA?IgiTPnHr&>5lsoSNrK0RsBnX><^= zGH`Ptzs-$05F}^GD-*t0U;m+gn$qb0zyCt2mv7=1cZPP z5CTF#2nc};0+oNlPL-`DYV=iWgX!NDQFOJxLy}8HOJG?U5CxF;!zL=Xfr-Z;)CnN% zJZtAwfn)kp0bs}diwWsEy}ch$sz?!vk_~|7OBmb-m7&zdh+sLqRsg0fDfC1rGQ5}`OrbMlA^l?4VRAZ?$hUdS&zd{|KKGUgXkK%cu0WD~n4U)U}UPtFHY9#t0@&Np7=}4`ut+}CmQDS#@m!6q@VobNzQ@{eiEe*{_ z9a{n*fB^_-21L?)yzkfc%lPa1BBh7l*5NpThx2fn9p;WWDRBIyH_FNYVpikYifx*+ z0>)hj0Dpd?Ns-2_kSeWmntA|W2So{K$XD265r`R&4B)wV`LXkL0Ep?!dm$hMgn$qb w0zyCt2mv7=1cZPP5CTF#2nYco@ShR*3vVQ(cm}eV=>Px#07*qoM6N<$g1xmw)Bpeg literal 0 HcmV?d00001 -- 2.51.2