From 93dc22b67da22267c4e60600ea68a6b5deae6b0c Mon Sep 17 00:00:00 2001 From: Alzore <140123969+Blackern5000@users.noreply.github.com> Date: Fri, 19 Jul 2024 04:38:26 -0500 Subject: [PATCH] Add the Syndicate Raid Suit (#29845) * Syndicate Raid Suit * Raid suit speed and whitelist * Fix copyright for the syndicate raid helmet --- .../Locale/en-US/store/uplink-catalog.ftl | 3 + .../Catalog/Fills/Backpacks/duffelbag.yml | 13 ++++ .../Prototypes/Catalog/uplink_catalog.yml | 16 ++++ .../Entities/Clothing/Head/helmets.yml | 18 +++++ .../Entities/Clothing/OuterClothing/armor.yml | 72 ++++++++++++++++++ .../syndie-raid.rsi/equipped-HELMET-vox.png | Bin 0 -> 464 bytes .../syndie-raid.rsi/equipped-HELMET.png | Bin 0 -> 439 bytes .../Head/Helmets/syndie-raid.rsi/icon.png | Bin 0 -> 289 bytes .../Helmets/syndie-raid.rsi/inhand-left.png | Bin 0 -> 388 bytes .../Helmets/syndie-raid.rsi/inhand-right.png | Bin 0 -> 376 bytes .../Head/Helmets/syndie-raid.rsi/meta.json | 30 ++++++++ .../equipped-OUTERCLOTHING-light-vox.png | Bin 0 -> 264 bytes .../equipped-OUTERCLOTHING-light.png | Bin 0 -> 268 bytes .../equipped-OUTERCLOTHING-vox.png | Bin 0 -> 743 bytes .../equipped-OUTERCLOTHING.png | Bin 0 -> 740 bytes .../Armor/syndie-raid.rsi/icon.png | Bin 0 -> 349 bytes .../Armor/syndie-raid.rsi/inhand-left.png | Bin 0 -> 422 bytes .../Armor/syndie-raid.rsi/inhand-right.png | Bin 0 -> 412 bytes .../Armor/syndie-raid.rsi/light-overlay.png | Bin 0 -> 199 bytes .../Armor/syndie-raid.rsi/meta.json | 41 ++++++++++ 20 files changed, 193 insertions(+) create mode 100644 Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/equipped-HELMET-vox.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/meta.json create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light-vox.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-vox.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/light-overlay.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/meta.json diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 2598970cef..8edbde9bdc 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -318,6 +318,9 @@ uplink-hardsuit-carp-desc = Looks like an ordinary carp suit, except fully space uplink-hardsuit-syndie-name = Syndicate Hardsuit uplink-hardsuit-syndie-desc = The Syndicate's well known armored blood red hardsuit, capable of space walks and bullet resistant. +uplink-syndie-raid-name = Syndicate Raid Suit +uplink-syndie-raid-desc = A very durable and reasonably flexible suit of blood-red armor, reinforced against all common forms of damage but not capable of space walks. Comes with a sick helmet. + uplink-hardsuit-syndieelite-name = Syndicate Elite Hardsuit uplink-hardsuit-syndieelite-desc = An elite version of the blood-red hardsuit, with improved mobility and fireproofing. Property of Gorlex Marauders. diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index ae57ea6342..71d3f00df3 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -247,6 +247,19 @@ - id: DoubleEmergencyOxygenTankFilled - id: DoubleEmergencyNitrogenTankFilled +- type: entity + parent: ClothingBackpackDuffelSyndicateBundle + id: ClothingBackpackDuffelSyndicateRaidBundle + name: syndicate raid suit bundle + description: "Contains the Syndicate's durable raid armor suit." + components: + - type: StorageFill + contents: + - id: ClothingOuterArmorRaid + - id: ClothingHeadHelmetRaid + - id: ClothingMaskGasSyndicate + - id: ClothingHandsGlovesCombat + - type: entity parent: ClothingBackpackDuffelSyndicateBundle id: ClothingBackpackDuffelSyndicateHardsuitBundle diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index c9dc048cd3..420982dcae 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1298,6 +1298,22 @@ categories: - UplinkWearables +- type: listing + id: UplinkClothingOuterArmorRaid + name: uplink-syndie-raid-name + description: uplink-syndie-raid-desc + icon: { sprite: /Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi, state: icon } + productEntity: ClothingBackpackDuffelSyndicateRaidBundle + cost: + Telecrystal: 8 + categories: + - UplinkWearables + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + - type: listing id: UplinkHardsuitSyndieElite name: uplink-hardsuit-syndieelite-name diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index a01d6fae51..b44508d4a3 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -357,6 +357,24 @@ - type: Clothing sprite: Clothing/Head/Helmets/ert_janitor.rsi +- type: entity + parent: ClothingHeadHelmetBasic + id: ClothingHeadHelmetRaid + name: syndicate raid helmet + description: An armored helmet for use with the syndicate raid suit. Very stylish. + components: + - type: Sprite + sprite: Clothing/Head/Helmets/syndie-raid.rsi + - type: Clothing + sprite: Clothing/Head/Helmets/syndie-raid.rsi + - type: Armor + modifiers: #There's gotta be SOME reason to use this over other helmets. + coefficients: + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.85 + Heat: 0.85 + #Bone Helmet - type: entity parent: ClothingHeadHelmetBasic diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 606af0b127..6de0c78220 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -99,6 +99,78 @@ reflects: - Energy +- type: entity + parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing] + id: ClothingOuterArmorRaid + name: syndicate raid suit + description: A somewhat flexible and well-armored suit with a powerful shoulder mounted flashlight manufactured in the Gorlex Marauder's iconic blood-red color scheme, it does not protect it's wearer from space. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Armor/syndie-raid.rsi + layers: + - state: icon + - state: light-overlay + visible: false + shader: unshaded + - type: Clothing + sprite: Clothing/OuterClothing/Armor/syndie-raid.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.35 + Slash: 0.35 + Piercing: 0.35 + Heat: 0.35 + Caustic: 0.5 + - type: ExplosionResistance + damageCoefficient: 0.35 + - type: ClothingSpeedModifier + walkModifier: 0.9 + sprintModifier: 0.9 + #Shoulder mounted flashlight + - type: ToggleableLightVisuals + spriteLayer: light + clothingVisuals: + outerClothing: + - state: equipped-OUTERCLOTHING-light + shader: unshaded + - type: Appearance + - type: HandheldLight + addPrefix: false + blinkingBehaviourId: blinking + radiatingBehaviourId: radiating + - type: PointLight + enabled: false + color: "#80ff80" + radius: 5 + energy: 2 + mask: /Textures/Effects/LightMasks/cone.png + autoRot: true + netsync: false + - type: LightBehaviour + behaviours: + - !type:FadeBehaviour + id: radiating + interpolate: Linear + maxDuration: 2.0 + startValue: 3.0 + endValue: 2.0 + isLooped: true + reverseWhenFinished: true + - !type:PulseBehaviour + id: blinking + interpolate: Nearest + maxDuration: 1.0 + minValue: 0.1 + maxValue: 2.0 + isLooped: true + - type: Battery + maxCharge: 600 + startingCharge: 600 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 2 + - type: entity parent: ClothingOuterBaseLarge id: ClothingOuterArmorCult diff --git a/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..c7ab17e261db024cc28cc4bd39ccd9b5c96b9e2c GIT binary patch literal 464 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~u2Ka=ydOBK|D5)edGlyE*WV*T^^$qqgFsxVCZusA@-rNePDzB9}XD2{24z1g*gj6B8wRq_>O=u<5X=vX`rQwo-U3d5$KYp zo1ahp)c&2EIj1>9HZ?vtR&m=uQ~n`y)x$JBlT(?8f81hY)r)t=;*IBdW1O3>m)3D1K|TW(6Tw5}F070Fl7`&Bbh>b$(8 z!l7TUpR=4Ut$MT~Do_0lqmk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~u2Ka=ydOBK|D5)edGlyE*WV*T^^$qqgFsxVCZusA@-rNePDzB9}XD2{24z1g*gj6B8wRq_zr?F*gaY|`gSWBu+v0fK#xHIwTw0HJA9&^9ExzxN|qQxZc_WQbyUk7uTqjob2MX5H| TzhwLcw4K4z)z4*}Q$iB}x@KnK literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..e8db961b7709cc1d13fba055e3128a3caa51f270 GIT binary patch literal 388 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`032l#}zdOBK|D5)edGlyE*9Q6(MFfgoF*KYXV0F;*(J!=G{I7@>3g8xGS zL$H5^5J<4VBeIx*f$snaGiF`ulFziEw{A?KIzE1s;~l)=&TAW6Um`I_5oP zMUekIXO3+%UFMi=kuPlIZs3k#Sks`XZ+Do*@Z5F%=TlbB6L9p3ICs3gAy)1^ci03k zt6xD&6sP`kxa!1W`Yr$HDweJP|G%|gp}&D6V3stm;1cEMH9fOu^xV3Wu_j?!Npp{H z1pC&l`%Evmacn!2m5{x!8)!q!1EvQ}`?*hi32r>e$IohJUC=mZ!k0Gk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`032l#}zdOBK|D5)edGlyE*9Q6(MFfgoF*KYXV0F;*(J!=G{I7@>3g8xGS zL$H5^5J<4VBeIx*f$snaGiF`uVFq{;NbRCFAJD{u<7Ts+qlFrREavMK94z3&HQ23@(aD*ce`Jke-+62SM_CGP3a1t zfg%kI9ZVnO4@iB!`!-)FG+x3?U*4l4*S99W|N`g~UXwE0V; zL~L4A#JFaiIk0I`^NUSSHu*6yxF3?5S9x>mwPL%XH2+muJq1VgW)$BG$(`~^`xkHO1>s-RwWNGrB=3e_GPZzmMvTy?$^1B+LS|ih_pf4;%)4?`V&Qj9jjvm;SU%sg@>jsA zeu?uE-c^FnKAhYeHM=n2c^-4upN%5k@7e#)oVHP_b3V{s5K#Yfc-Naxt2eHf4lp~m z*#F?luN7;p3QjrSmArB3PQxM}2cB{^w`X-=wbPA!^A&?kn+1*Z7JvjiUHx3vIVCg! E0L}ztoB#j- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..1ab6e6cfefe51dee46c988f49638bdb6991abdd1 GIT binary patch literal 743 zcmV?P)Px#1ZP1_K>z@;j|==^1poj5Ay7MMqCTIaN74 zNH8$~006-buL}SG01I?dPE-H?|NsC0|NsC007_2*@&Et;32;bRa{vGi!2kdb!2!6D zYwZ940ys%TK~z{r?N-~8>>volRiozrKX@A?33%Dm);SORFrCV%w01xph0cG(N8lsC z_@4r=T0u+K^QqGpMXAKt%Mq77Qe1vEP)yvSl=Dg<=A77vkTTuA7y-&DQeZ$Rn@=c& zKR_Rze*_}N7X}opkBS|C*9uWMj-%iWL`AI+m@gH4g@WN9DM(j+$~?aFMIOgLA;5wA zp+yK3TCJs(TASss8l`kQP(zaSun@krR`5Fh7Qhre0&b-RM3FtH@`m`hpcP_EX!>Z| zgTQwW!V~x{An4lw8$sJ6mb}#}*o1gcs>K6#rnBd*K!yUQr!4j%W6e8(gxx}AwUHTX z-qd+<2-AlJQ;P=(<#z%+{iYm&>2qa=6{wXNEoNX9h3~}$D}YZ2{apdd7|PpeBft{Z z&k{YhAwnnchSdjtC9uLr;3L5Ja{}{W{02XO;@6wPm_4}u5qH*$z?41M{x~&Ll#^c# z1B8lcd#G{>aOD7MaS(!&19$J)x*Xb^Bpho2W`cB53&RTVH;#iZ*JTWW?_G#{|C|8C zabj|UpausaY8~d;g@Y>tXEwW_76&0(+g~hbME2lE0eIkZ2iw5CPwc|xV&EGC4j=+c zJ2i$Zw$=wMsYw7KZf#_S002ovPDHLkV1h+HHWUB= literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..e6a0733e3e7a11c8d9eb3f1203348634d169174b GIT binary patch literal 740 zcmVPx#1ZP1_K>z@;j|==^1poj5Ay7vPg zlxW}gf=8;>dZP2S)QLZ8g@|i~L#<3yto4NO=v|=U_*1GBu2#ymKX_)yOJN@Pw?HYG z_oL*CgzyakHiXzl{w+W`9RXBMmswQ4wN~&r{t!r*f}^;VRuDD`BB=UcD_jLo;bx_q z69{~dfRA3l=t$Tmf@|lFB|jR4@`kcl!;V5iZ=QD%KmnVqgb}QGC$M3+P}xF(74HSG zI(Us(V8M?D%SVDJ!*fB`W?CR8APZ=}OR(~ub^`d0`p+8J2jJyrfD@3x@q_}a0sIT0 zZ`d8M0nF;~0#8^B@H>G8J^~*B!G8BzMr{AQFH)Nq$fx0p;K`@}q!A;K0KDZ{`Ff2sqHD zH}nx?s+u2I!vv)&`Q*X94yLE+^==IllxmpjXbv_eT8j_yT+hQ~EHu z-(?2^O(7g6^X6_==mqZJ1?2L761csc*t~X0000B9}XD2{24z1g*gj6B8wRq_zr_Go-U3d7XEK11o9nL;BlVI%Jldj z`@GA`RM%YnW}C^kBEeR{^qBbH##qjVBS{xoJ~UVW-hB4pr}agAMMoY}hL&`rDUtLY2t7Di867xAXpqHaJ8kuCuk- zE79KnL5!itljSH!%T^|y)e(ZnQa-zj9e8YFcUbV4^?@xmdfTLab36R3{K;Y=#C=_M e!wdEX!#IO?%1Re@d_4_xIfJLGpUXO@geCxweu13; literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..64d25308ab68dab7296df91bbd2c646a2ef7698b GIT binary patch literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`032l#}zCNVQN{BNjN*EUg7*(%59?`WCn>K8JN?v*SZ zX&$$@MDMfTFJ5eH{Gh02z?jG+ETB`7l6k0vTmQ}qH3~CuF-aCJgyYjbohQ0ZG{kWivL!KKf_g!Ntwcwsq92n5LU%8{3=eky@ z1?P*kul_eWiR!Vg*>k9g$NolHKc|nwi~}r3;yFdGuBct7?d+6UF2Xqf_tFPbx$=tl zKNUIC&XTv>;qX`CM?2-27b`X%Z?X_CiFsL**4Ne&=*{t}c)#k_&%F*@mza52zxRJ| zb?iA&yg&JZ2ve@df-*hUt8A$rJ97QY*L=u!T6l{an^LB{Ts5 D1;C-U literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..fd3c44d4ad09e49a525fcb1f0e7f0ddd22400859 GIT binary patch literal 412 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`032l#}zCNVQN{BNjN*EUg7*(%59?`WCn>KB*Ojew1a#t3Op{mLmU79Pl|SMv67hF zd-L$ON`YlhDnA?u_$4I1!=bQ|TSS}T)b8~&Bx@@!nj1gg%dlv2pu=mg+uNodHF;&g z^h}^ca0Y*4ua%FJNV1QnTb8oG+#4C4UsqN$y6`GQIMr1(_DXpK>?;$TvEpNsLtpwU zJ?2Hs3K#y{{woj&P4N0w-?+k{bN*u{aSgqK#!ux;1ybAz!V?ZJ&`4m+VOpvo(>;eH zf?+m;9+!tgE!lvI6;>1s;*b3=DjSK$uZf!>a)(7~|>U7!u+B_EI8Og91<6!<#4fM7~bDcP7o} zgL}(F!K=Ry{5WDi+nMo$)GX6qg)2^eHjHKd@%piBG{?N%v)WYCS0B}y%FVm$X=poh qNGWqzX2|2qcE33p85sWgrLaa6iMXCUbW#Fn4}+(xpUXO@geCyZ)kISO literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/meta.json new file mode 100644 index 0000000000..ff590848da --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by alzore_(Discord) for SS14 using the colors of the blood-red hardsuit", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "light-overlay" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-light", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-light-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} -- 2.51.2