From 54b99bda4a623dabcdd1f0a3b866cbb646a11e03 Mon Sep 17 00:00:00 2001 From: ZeroDayDaemon <60460608+ZeroDayDaemon@users.noreply.github.com> Date: Sat, 23 Apr 2022 19:41:59 -0400 Subject: [PATCH] Add operative outfits and syndicate magboots (#7717) --- .../Catalog/Fills/Backpacks/duffelbag.yml | 12 +++++ .../Catalog/Fills/Boxes/emergency.yml | 18 ++++++++ .../Prototypes/Catalog/uplink_catalog.yml | 9 ++++ .../Entities/Clothing/Shoes/boots.yml | 11 +++++ .../Entities/Clothing/Shoes/magboots.yml | 24 ++++++++++ .../Entities/Objects/Specific/syndicate.yml | 20 +++++++++ .../Roles/Jobs/Fun/misc_startinggear.yml | 34 +++++++++++++++ .../magboots-syndicate.rsi/equipped-FEET.png | Bin 0 -> 455 bytes .../Boots/magboots-syndicate.rsi/icon-on.png | Bin 0 -> 405 bytes .../Boots/magboots-syndicate.rsi/icon.png | Bin 0 -> 405 bytes .../magboots-syndicate.rsi/inhand-left.png | Bin 0 -> 347 bytes .../magboots-syndicate.rsi/inhand-right.png | Bin 0 -> 362 bytes .../Boots/magboots-syndicate.rsi/meta.json | 41 ++++++++++++++++++ .../on-equipped-FEET.png | Bin 0 -> 454 bytes .../magboots-syndicate.rsi/on-inhand-left.png | Bin 0 -> 344 bytes .../on-inhand-right.png | Bin 0 -> 361 bytes 16 files changed, 169 insertions(+) create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon-on.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-inhand-left.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-inhand-right.png diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index c3a8a38a57..ff33f7f9eb 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -189,3 +189,15 @@ - type: StorageFill contents: - id: ClothingOuterHardsuitSyndie + +- type: entity + parent: ClothingBackpackDuffelSyndicate + id: ClothingBackpackDuffelSyndicateOperative + name: operative duffelbag + components: + - type: StorageFill + contents: + - id: BoxSurvivalSyndicate + - id: SurvivalKnife + - id: PistolClarissa + - id: BaseUplinkRadio40TC diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml index dcdecfc68b..a6dde8ea74 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml @@ -91,3 +91,21 @@ - id: EmergencyMedipen - id: Flare - id: FoodSnackChocolate + +- type: entity + name: extended-capacity survival box + parent: BoxCardboard + id: BoxSurvivalSyndicate + description: It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank. + components: + - type: StorageFill + contents: + - id: ClothingMaskGasSyndicate + - id: ExtendedEmergencyOxygenTankFilled + - id: EmergencyMedipen + - id: Flare + - id: FoodSnackChocolate + - type: Sprite + layers: + - state: internals + - state: extendedtank \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 6b97f83f53..97b16ecfea 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -261,6 +261,13 @@ description: The Syndicate's well known armored blood red hardsuit, capable of space walks and bullet resistant. price: 8 +- type: uplinkListing + id: UplinkClothingShoesBootsMagSyndie + category: Armor + itemId: ClothingShoesBootsMagSyndie + description: A pair of magnetic boots that will keep you on the ground if the gravity fails or is sabotaged, giving you a mobility advantage. If activated with gravity they will protect from slips, but they will slow you down. + price: 2 + - type: uplinkListing id: UplinkEVASyndie category: Armor @@ -268,6 +275,8 @@ description: A simple EVA suit that offers no protection other than what's needed to survive in space. price: 4 + + # Misc - type: uplinkListing diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml index 925ebe4ce7..32a6290a5a 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml @@ -41,3 +41,14 @@ sprite: Clothing/Shoes/Boots/performer.rsi - type: Clothing sprite: Clothing/Shoes/Boots/performer.rsi + +- type: entity + parent: ClothingShoesBase + id: ClothingShoesBootsCombat + name: combat boots + description: Robust combat boots for combat scenarios or combat situations. All combat, all the time. + components: + - type: Sprite + sprite: Clothing/Shoes/Boots/jackboots.rsi + - type: Clothing + sprite: Clothing/Shoes/Boots/jackboots.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml index aa33d60255..c161e81029 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml @@ -46,3 +46,27 @@ sprintModifier: 1 enabled: false - type: NoSlip + +- type: entity + parent: ClothingShoesBase + id: ClothingShoesBootsMagSyndie + name: blood-red magboots + description: Reverse-engineered magnetic boots that have a heavy magnetic pull. Property of Gorlex Marauders. + components: + - type: Sprite + sprite: Clothing/Shoes/Boots/magboots-syndicate.rsi + state: icon + - type: Clothing + sprite: Clothing/Shoes/Boots/magboots-syndicate.rsi + - type: Magboots + toggleAction: + icon: Clothing/Shoes/Boots/magboots-syndicate.rsi/icon.png + iconOn: Clothing/Shoes/Boots/magboots-syndicate.rsi/icon-on.png + name: action-name-magboot-toggle + description: action-decription-magboot-toggle + itemIconStyle: NoItem + event: !type:ToggleActionEvent + - type: ClothingSpeedModifier + walkModifier: 0.85 + sprintModifier: 0.8 + enabled: false diff --git a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml index c9cfbc3c6c..f490d8a631 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml @@ -73,6 +73,26 @@ presetInfo: balance: 20 + +#Default Nuclear Operative amount, not considering crew count +- type: entity + parent: BaseUplinkRadio + id: BaseUplinkRadio25TC + suffix: 25 TC + components: + - type: Uplink + presetInfo: + balance: 25 + +- type: entity + parent: BaseUplinkRadio + id: BaseUplinkRadio40TC + suffix: 40 TC + components: + - type: Uplink + presetInfo: + balance: 40 + - type: entity parent: BaseUplinkRadio id: BaseUplinkRadioDebug diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index a55d3d772a..29eabf370a 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -64,3 +64,37 @@ innerclothingskirt: ClothingUniformJumpskirtColorBlack satchel: ClothingBackpackDuffelSyndicateAmmo duffelbag: ClothingBackpackDuffelSyndicateAmmo + +#Syndicate Operative Outfit - Basic +- type: startingGear + id: SyndicateOperativeGearBasic + equipment: + jumpsuit: ClothingUniformJumpsuitOperative + back: ClothingBackpackDuffelSyndicateOperative + ears: ClothingHeadsetAltSyndicate + gloves: ClothingHandsGlovesCombat + shoes: ClothingShoesBootsCombat + id: AgentIDCard + innerclothingskirt: ClothingUniformJumpsuitOperative + satchel: ClothingBackpackDuffelSyndicateOperative + duffelbag: ClothingBackpackDuffelSyndicateOperative + +#Syndicate Operative Outfit - Full Kit +- type: startingGear + id: SyndicateOperativeGearFull + equipment: + jumpsuit: ClothingUniformJumpsuitOperative + back: ClothingBackpackDuffelSyndicateOperative + mask: ClothingMaskGasSyndicate + # eyes: Night Vision Goggles whenever they're made + eyes: ClothingEyesGlassesMeson + ears: ClothingHeadsetAltSyndicate + gloves: ClothingHandsGlovesCombat + outerClothing: ClothingOuterHardsuitSyndie + shoes: ClothingShoesBootsCombat + id: AgentIDCard + pocket1: ExtendedEmergencyOxygenTankFilled + belt: ClothingBeltMilitaryWebbing + innerclothingskirt: ClothingUniformJumpsuitOperative + satchel: ClothingBackpackDuffelSyndicateOperative + duffelbag: ClothingBackpackDuffelSyndicateOperative diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..f83edfab43699a4908dc13656e02a749a88cf6d5 GIT binary patch literal 455 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e-2k5uS0G)luI=sRWo2Q}uVeU* zf#Ilcu)4bXS_}KB`i6cIGD&iZVPRqUN@_*Q>PGCZvVj^HOM?7@862M7NCR^6t3o15 zTvCgZi!uvJGV}8o7%JujhZPi+e*Y3&@bT*tEpJ_|b7#&6ZwNKGX#C)j&UqirlMF>Y zy*n(7gN!d5dnwF$H0j8s5QX5CJB;*IjZMuB?>cmL8>?12` z3ceOI&gNyfaaH<%<<4#!pw(wRT^vI^I+GJ5SQjUVOyFc`<>_Hz6{rzcXI2(xXPIxP zvvGleuE4?bGa>?vlm$H<-I5&>*_|2;g;yk~ZE89(lWCIiM4t(BG#^+73!LQbG8SJm zXGO!2`Fj)1jpjd}@T7INQ~HFT{BcSjB`sRHSy{SO1;Zpx+g7OObR548w6TXNiDC01 zg;fk2jyOEr+`W`b;j^PE+bX6`vk=w;Ld>p=kI$@J!PTJ3*2T1Lrjv%%jYbgjUZ++2 s#GhtB1y{KW4|krZ@l5DsOk`x(e^+m>u9W6ZpvM?IUHx3vIVCg!0EG9U5C8xG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon-on.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon-on.png new file mode 100644 index 0000000000000000000000000000000000000000..68fd67a43809520193483dbbcf3495b9fa18f3bb GIT binary patch literal 405 zcmV;G0c!qnNzFC{ZI zH!JAX(aW?DO$N+yV^$~tJ7pxa~HF{qLW z&pig%gDR;IyXw6`YfS~fBS7tu?1=)2ZbMvIU-L9xYg~dyv*_@-f!h(2!PX6*8(h!Y zY%m0tuLeJ>z%H7R_nNzFC{ZI zH!JAX(aW?DO$N+yV^$~tJ7pxa~HF{qLW z&pig%gDR;IyXw6`YfS~fBS7tu?1=)2ZbMvIU-L9xYg~dyv*_@-f!h(2!PX6*8(h!Y zY%m0tuLeJ>z%H7R_7@wIE`KLMcMCI=B?FHDu`(WXd)4CcFY6IJoO2R9(#K)Iku*1#~Mx@gufV zaq&0^ZVttqgoFRzbe89E&I|AMNB{r;00030jA!fOFbs_(m1U_Q2qa0taHyL+_nOGJ z>QXY5WM^ zbGEmm>O;HJsm}X7Nm8*|ThF&TfU9wAvcdPhp7i?427%tHO8dUA%=@&SZ+!)d z)mqE@JNc4|!=s<`!)T<E?X0R{dSJ3wL8|3L!SOcL{iQSi#J_8GOz7Kg zZdtMOc}Ms*H)TJoT!u|Q7kxZB{p|j04WAt|CcQhpM`oL~N^Jl0MG41CJ?CscCLXW) z{}xBeXV%TLvttx)-~PX6-`nqzdehG=yXnNzFC{ZIH!D>Hre20yYYeWdg=iEtq+-a)2Nc7hIADE3Xx5wer?v;sr0sTeI>G-O7P6 zX1N<;j>y_4#E4xA`u(C_!EqeNaej?02aD+tHl`dr`=>+f3Jf`T3Z_GB26#BY*ZGu# w%?Wurgw2!#^Do8a5SuFwIWX^t%OO5_18-ynItq%jUjP6A07*qoM6N<$f)X>UZ~y=R literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..36ea8a7a3edc37b86ad4343e7d228c0acc4ce9c5 GIT binary patch literal 344 zcmV-e0jK_nP)YU7>4mDwIE`LLMccy>fjRSX6){$chQ@0>L>&UcfAHhXcq@(L8Rc?trUxYYC9Dd z;~=^T3Q0@w`Auhe59fUFZ7)cYBuSDa{WC#c7dM;D6ks$O5r!cEVWUB}*9#Vr|E+Q! zpYNod6d>BYW+UF@>M~;Q;GXf*Gu;K`mp*{6#{!)7F4&JBcmzrd%Kt^?cedg+Z4oYtxU^ry4j^GhAT`A#cM>Yw|1RIQQJLtZ8m)+-f~;63;J(pR8AoiV(< zp#t=`w!hDJQN(;cXE+$-nwKO=k|arzBuSEf78Ld2S@j3XMf`l0{eeObAj|$hsc4_i qx<62;0p!siDAWqrACM$T%FqXG3b%B5zU%$~00002aI)ll=rB-nwM9w8q7G%=Ydrorgzi0Te$;{;>@hehhF@KVzqK$33tR$ZtJK{x9#! zrBZUVyvW{jheKXis#G}6WdUgP`g33Wr1?i0aJpGes`>Zxa*)kY%||?SyR2j~R8y~W zU;H%rM~*