From 375cc7171a07bb44e6fd65622cb3546e12ea2b45 Mon Sep 17 00:00:00 2001 From: Lamrr <96937466+Lamrr@users.noreply.github.com> Date: Wed, 19 Jan 2022 04:26:09 +1100 Subject: [PATCH] Adds captain's carapace. (#6207) --- .../Catalog/Fills/Lockers/heads.yml | 1 + .../Entities/Clothing/OuterClothing/armor.yml | 18 ++++++++++++ .../Prototypes/Roles/Jobs/Command/captain.yml | 2 +- .../equipped-OUTERCLOTHING.png | Bin 0 -> 990 bytes .../Armor/captain_carapace.rsi/icon.png | Bin 0 -> 500 bytes .../captain_carapace.rsi/inhand-left.png | Bin 0 -> 286 bytes .../captain_carapace.rsi/inhand-right.png | Bin 0 -> 291 bytes .../Armor/captain_carapace.rsi/meta.json | 26 ++++++++++++++++++ 8 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index fbbe5f0aaa..58f5197904 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -33,6 +33,7 @@ components: - type: StorageFill contents: + - id: ClothingOuterArmorCaptainCarapace - id: NukeDisk prob: 1 - id: PinpointerNuclear diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 87d1b55132..ce686bca06 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -152,3 +152,21 @@ Slash: 0.7 Piercing: 0.4 Heat: 0.9 + +- type: entity + parent: ClothingOuterBase + id: ClothingOuterArmorCaptainCarapace + name: "captain's carapace" + description: "An armored chestpiece that provides protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest." + components: + - type: Sprite + sprite: Clothing/OuterClothing/Armor/captain_carapace.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Armor/captain_carapace.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.5 + Slash: 0.5 + Piercing: 0.6 + Heat: 0.5 diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index 33ebd834f9..306d484f05 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -49,7 +49,7 @@ head: ClothingHeadHatCaptain eyes: ClothingEyesGlassesSunglasses gloves: ClothingHandsGlovesCaptain - outerClothing: ClothingOuterHardsuitCap + outerClothing: ClothingOuterArmorCaptainCarapace id: CaptainPDA ears: ClothingHeadsetAltCommand innerclothingskirt: ClothingUniformJumpskirtCaptain diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..ce947bed2a1ce2ce7a7fc649e0431e7f006ccc05 GIT binary patch literal 990 zcmV<410np0P)CJeI|`Gj?Pdp*!z))(;o9UaU10$ib;JAUPpV9<|x?p$BJ*#3mO55GBI zvgS(`WfJ@t%0K=UR6yzJjfu5q!d~E|^FjF=<^iCt!k>Wr>WCUIoyS%Ka61|j{VtH6 zTsvF~sEgpX1y^Wrmex>uz6xh)4X)6@Z3|ErV@UvSR>5rxzkT})xNS|9_)rNL)GN$W zGe{oQkUXm4#n118-=3Pe(zX9GoRv+K*AK9)FQB}B0B2=$;(LW|0as{%(2zW;;qI@u zhXI}a0f~cw`I0H>qTK2i@fds9Y7~*QYZK2s6J4Za3(_9}!|b8-d^NVwzcwg(PVR5t zlK);A2!bF8f*=TjAP9mW2!goQgm#AfSJ25n_9J(J;)sif5jm-(M>h4DLv$VRV>!(4 z;-r#Bm>0EUCm`i?kSa7sHo0wKZeu6#=M_CC6ZalP{)RYl?@^#9gphL^JCfVh$eJ%S zk#ag?-*0SVgfWKs)AzW)C&4u<*zeorzCZ6qoq&Ef81)YrRUx-6+~4ys&)x%U{LUP^ z0$QyWJD$CXcDv06^$Hu*D~#L2M7Tmj%IU;nj`C&|DW?-y;@r02$J1`N+41a6v|23| z$wYJE{%k=i*@85lWMeT&6g@Z8I@1jk>r@qR5px?m!*6r!RxBS#_!wpnuv_rd4CXd= zrb;@Wwj5od!CBc1K2nH-($gDoRyK#Wd`#aYTv}HCtZY2VM&1H`t9>b+NW}lE-2S;V z#W4_4i8M73t7upl4HkpR%-{t`EEeGf7|v`mSiAsTXhk9&baGTU zbrFL)i5yAq4ApZN6?eEq;y&AR`98nro8P~KfPjGiPRNZ&9GNxsfpGvjPxsM|wnIPB z*%914{vbs-p4bAwh-VRVc~cyjHSHQPmp6@g7J%c4Egqx@cFku*z7oXLB9(HA6Zy8S zxpsG2+L)@M{WJprW1IZ|blj;3)dJD_*#}Lueuhvj&~c|a?)*v*0Aw;56X1Su?%neg0Yy<<#TMKeP!uJk>pDWU0KiKkMNBOcQ;WPLQdG(^C-N=2uDgER zQw9LUT;5UhgQZ3@-Roh8PLoSM84yKNpI)`b%#JmFyUS>r<~nY~)7D51Sxp8YO&$WU zus8btJvjtg34b#1Hg@)9)9&nM0e!m!Mt;%i{)71o$H*D+EJA6+#}d4CKZz8br~8gs zx3b_do@WECG)t3*4Cj*8=3ChF@n>YGH=Qq0000!)A$S;_|;n|HeAZLrGi(`n#@#F*v*2N6k0uBa}8&4WrDco>k z@kt0#N|+g-U?wf`FwI~UcS4|o(vky9I7}6`2+Zcxa@1OyFt_L7I>#G2V*I?E?HU?K z*Ewu45m}~ig(KUd<*+D=dg9kP8J1UaA7!>hh#GKlEiiODs3EaxDJ%2BOHDSy9E?jY zG4UlVWv;RyhCw literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..cef6f162c719878faa0304435ed3aa68bb35ba13 GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|ei2$DvS0Jsasp;t85EK{~8X6iI z8JUofke8R2w&g)9P>!)A$S;_|;n|HeAZMqii(`n#@wZbp@*PqTXtR9GER%IuYsN3O zciR>gs%bvty_22s>la_rl+&(k)A{}g|9`ssKa--mOQ@*mv@Tip7eP%258ZLA|HUZ5 zAg9UHW5BNF_fzDei*c6PLfPlxvp3l(a4*>;_2&%Z^78qc%#YuFRO88@lhbhH{_>JZ zlWN%~MA#=@?P66;=>D%Z<@d+uJ$DNi?>;lR;lg&?y5HK2j~*<)6MTSudNtRL9A<|t lCGom_KMrXz>|9m