From f399126c66283c24bc928ba56b703eb53123f817 Mon Sep 17 00:00:00 2001 From: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Date: Wed, 30 Apr 2025 12:40:27 +1200 Subject: [PATCH] Centcomm carapace, moved armour from vests.yml to armor.yml (#35301) * centcomm carapace, loadout for CC official, move armoured vests from vests.yml to armor.yml * revert rename from previous commit; command carapace returned to captain's carapace * meta.json 4 space * restored deleted comments for some armours and original description for slim armour * Add recently added elite web vest --------- Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> --- .../Entities/Clothing/OuterClothing/armor.yml | 200 +++++++++++++----- .../Entities/Clothing/OuterClothing/vests.yml | 82 +------ .../Roles/Jobs/CentComm/official.yml | 2 +- .../equipped-OUTERCLOTHING-vox.png | Bin 0 -> 771 bytes .../equipped-OUTERCLOTHING.png | Bin 0 -> 778 bytes .../Armor/centcomm_carapace.rsi/icon.png | Bin 0 -> 546 bytes .../centcomm_carapace.rsi/inhand-left.png | Bin 0 -> 588 bytes .../centcomm_carapace.rsi/inhand-right.png | Bin 0 -> 598 bytes .../Armor/centcomm_carapace.rsi/meta.json | 30 +++ 9 files changed, 183 insertions(+), 131 deletions(-) create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/centcomm_carapace.rsi/equipped-OUTERCLOTHING-vox.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/centcomm_carapace.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/centcomm_carapace.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/centcomm_carapace.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/centcomm_carapace.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/centcomm_carapace.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index acb44c8ad8..243759c871 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -1,5 +1,6 @@ # Numbers for armor here largely taken from /tg/. -# NOTE: Half of the kind of armor you're probably thinking of is in vests.yml. These should probably be merged some day. +# armor.yml covers both armored vests (e.g. not just cosmetic) and armor that covers multiple bodyparts/limbs + #Basic armor vest for inheritance - type: entity @@ -41,28 +42,6 @@ - type: Clothing sprite: Clothing/OuterClothing/Armor/security_slim.rsi -- type: entity - parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseSecurityContraband] - id: ClothingOuterArmorRiot - name: riot suit - description: A suit of semi-flexible polycarbonate body armor with heavy padding to protect against melee attacks. Perfect for fighting delinquents around the station. - components: - - type: Sprite - sprite: Clothing/OuterClothing/Armor/riot.rsi - - type: Clothing - sprite: Clothing/OuterClothing/Armor/riot.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.4 - Slash: 0.4 - Piercing: 0.7 - Heat: 0.9 - Caustic: 0.9 - - type: ExplosionResistance - damageCoefficient: 0.9 - - type: GroupExamine - - type: entity parent: ClothingOuterArmorBase id: ClothingOuterArmorBulletproof @@ -105,6 +84,133 @@ reflects: - Energy +#Detective's vest +- type: entity + parent: [ClothingOuterArmorBase, BaseSecurityContraband] + id: ClothingOuterVestDetective + name: detective's vest + description: A hard-boiled private investigator's armored vest. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Vests/detvest.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Vests/detvest.rsi + +- type: entity + parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing] + id: ClothingOuterArmorBaseCarapace + abstract: true + components: + - type: Armor + modifiers: + coefficients: + Blunt: 0.5 + Slash: 0.5 + Piercing: 0.6 + Heat: 0.5 + Caustic: 0.9 + - type: ExplosionResistance + damageCoefficient: 0.65 + - type: ClothingSpeedModifier + walkModifier: 1.0 + sprintModifier: 1.0 + - type: HeldSpeedModifier + - type: GroupExamine + +- type: entity + parent: [ClothingOuterArmorBaseCarapace, BaseCommandContraband] + 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: entity + parent: [ClothingOuterArmorBaseCarapace, BaseCentcommContraband] + id: ClothingOuterArmorCentcommCarapace + name: centcomm carapace + description: An armored chestpiece that provides protection whilst still offering maximum mobility and flexibility. Issued only to centcomm officials and agents. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Armor/centcomm_carapace.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Armor/centcomm_carapace.rsi + +#Web vest +- type: entity + parent: [ClothingOuterStorageBase, AllowSuitStorageClothing, BaseSyndicateContraband] + id: ClothingOuterVestWeb + name: web vest + description: A synthetic armor vest. This one has added webbing and ballistic plates. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Vests/webvest.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Vests/webvest.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 #ballistic plates = better protection + Slash: 0.6 + Piercing: 0.3 + Heat: 0.9 + - type: ExplosionResistance + damageCoefficient: 0.9 + +#Elite web vest +- type: entity + parent: [ClothingOuterStorageBase, AllowSuitStorageClothing, BaseSyndicateContraband] + id: ClothingOuterVestWebElite + name: elite web vest + description: A synthetic armor vest. This one has added webbing and heat resistant fibers. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Vests/elitevest.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Vests/elitevest.rsi + - type: TemperatureProtection + heatingCoefficient: 0.1 + coolingCoefficient: 0.1 + - type: Armor + modifiers: + coefficients: + Blunt: 0.5 + Slash: 0.5 + Piercing: 0.7 + Heat: 0.3 + Radiation: 0.5 + Caustic: 0.5 + - type: ExplosionResistance + damageCoefficient: 0.5 + - type: FireProtection + reduction: 0.85 + +#Mercenary web vest +- type: entity + parent: [ BaseMajorContraband, ClothingOuterVestWeb] #web vest so it should have some pockets for ammo + id: ClothingOuterVestWebMerc + name: mercenary web vest + description: A high-quality armored vest made from a hard synthetic material. It's surprisingly flexible and light, despite formidable armor plating. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Vests/mercwebvest.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Vests/mercwebvest.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.7 #slightly better overall protection but slightly worse than bulletproof armor against bullets seems sensible + Slash: 0.7 + Piercing: 0.5 + Heat: 0.9 + - type: ExplosionResistance + damageCoefficient: 0.9 + + +# Armor covering multiple body parts including limbs - type: entity parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseSyndicateContraband ] id: ClothingOuterArmorRaid @@ -184,6 +290,28 @@ - type: Item size: Normal +- type: entity + parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseSecurityContraband] + id: ClothingOuterArmorRiot + name: riot suit + description: A suit of semi-flexible polycarbonate body armor with heavy padding to protect against melee attacks. Perfect for fighting delinquents around the station. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Armor/riot.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Armor/riot.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.4 + Slash: 0.4 + Piercing: 0.7 + Heat: 0.9 + Caustic: 0.9 + - type: ExplosionResistance + damageCoefficient: 0.9 + - type: GroupExamine + - type: entity parent: [ ClothingOuterBaseLarge, BaseMajorContraband, AllowSuitStorageClothing ] id: ClothingOuterArmorCult @@ -270,32 +398,6 @@ - type: Clothing sprite: Clothing/OuterClothing/Armor/magusred.rsi -- type: entity - parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseCommandContraband] - 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 - Caustic: 0.9 - - type: ClothingSpeedModifier - walkModifier: 1.0 - sprintModifier: 1.0 - - type: HeldSpeedModifier - - type: ExplosionResistance - damageCoefficient: 0.65 - - type: GroupExamine - - type: entity parent: [ ClothingOuterBaseLarge, BaseMajorContraband, AllowSuitStorageClothing ] id: ClothingOuterArmorChangeling diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml index e008fba094..66913c348d 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml @@ -1,84 +1,4 @@ -#Web vest -- type: entity - parent: [ClothingOuterStorageBase, AllowSuitStorageClothing, BaseSyndicateContraband] - id: ClothingOuterVestWeb - name: web vest - description: A synthetic armor vest. This one has added webbing and ballistic plates. - components: - - type: Sprite - sprite: Clothing/OuterClothing/Vests/webvest.rsi - - type: Clothing - sprite: Clothing/OuterClothing/Vests/webvest.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.6 #ballistic plates = better protection - Slash: 0.6 - Piercing: 0.3 - Heat: 0.9 - - type: ExplosionResistance - damageCoefficient: 0.9 - -#Elite web vest -- type: entity - parent: [ClothingOuterStorageBase, AllowSuitStorageClothing, BaseSyndicateContraband] - id: ClothingOuterVestWebElite - name: elite web vest - description: A synthetic armor vest. This one has added webbing and heat resistant fibers. - components: - - type: Sprite - sprite: Clothing/OuterClothing/Vests/elitevest.rsi - - type: Clothing - sprite: Clothing/OuterClothing/Vests/elitevest.rsi - - type: TemperatureProtection - heatingCoefficient: 0.1 - coolingCoefficient: 0.1 - - type: Armor - modifiers: - coefficients: - Blunt: 0.5 - Slash: 0.5 - Piercing: 0.7 - Heat: 0.3 - Radiation: 0.5 - Caustic: 0.5 - - type: ExplosionResistance - damageCoefficient: 0.5 - - type: FireProtection - reduction: 0.85 - -#Mercenary web vest -- type: entity - parent: [ BaseMajorContraband, ClothingOuterVestWeb] #web vest so it should have some pockets for ammo - id: ClothingOuterVestWebMerc - name: mercenary web vest - description: A high-quality armored vest made from a hard synthetic material. It's surprisingly flexible and light, despite formidable armor plating. - components: - - type: Sprite - sprite: Clothing/OuterClothing/Vests/mercwebvest.rsi - - type: Clothing - sprite: Clothing/OuterClothing/Vests/mercwebvest.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.7 #slightly better overall protection but slightly worse than bulletproof armor against bullets seems sensible - Slash: 0.7 - Piercing: 0.5 - Heat: 0.9 - - type: ExplosionResistance - damageCoefficient: 0.9 - -#Detective's vest -- type: entity - parent: [ClothingOuterArmorBase, BaseSecurityContraband] - id: ClothingOuterVestDetective - name: detective's vest - description: A hard-boiled private investigator's armored vest. - components: - - type: Sprite - sprite: Clothing/OuterClothing/Vests/detvest.rsi - - type: Clothing - sprite: Clothing/OuterClothing/Vests/detvest.rsi +#NOTE: vests with armor belong to armor.yml #Hazard vest - type: entity diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/official.yml b/Resources/Prototypes/Roles/Jobs/CentComm/official.yml index be9a0675ad..10fb00448e 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/official.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/official.yml @@ -24,7 +24,7 @@ head: ClothingHeadHatCentcom eyes: ClothingEyesGlassesSunglasses gloves: ClothingHandsGlovesColorBlack - outerClothing: ClothingOuterArmorBasic + outerClothing: ClothingOuterArmorCentcommCarapace id: CentcomPDA ears: ClothingHeadsetAltCentCom belt: WeaponPistolN1984 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/centcomm_carapace.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/centcomm_carapace.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..b08dfeab807956f81d07ff0d36ef2255af344d0d GIT binary patch literal 771 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1E1o(uwinxkdHQMOp=`E{}zdYB>RFR#}Uf}<^Xg)qZSy@?T6Oh6i&t(gN z6i-QzU+{kfU=X^0?i^5@v%n*=n1O-s5C}7hYIrpO1tm&cBT9nv(@M${i&7Z^5;OBk z^!!{y6ioFD^-P5BFKY&>*_ImNnda%K#lQjNurf$7vNA9NSzbUa4P}FTrNPJy7H0yo z4H=mj1b}oD5NEctfW@nsj=y@28W+?+uY63e03s9wjk+A{e0*I*~8(9}X zOqv2@g8&oITqdx}AWI7%3#!Y|zyKt>fuqN7iFSVjFnF^(T^vIq+}}>S-FH}l$K~wV zmS_L}mmlv7?^Z0?{mOgmBby~N3f0^uS}pwSyX~NvfZgeab%*NGI-Gh8EB0y!=>-Lz ze0fVkVD3!zz2)9ZA4Hw{`*)GBn!@_ug-Y`T?oMkqv}4`&>QJe1$*P;HB>60#tFy^4 zpEy}wQs7}~YphV%vBk(jW7!-f*)Z)oCQIgZVf``!AH}Y*T`_Pva`ly5f&` zVoV-Q5768hrafh!?84?2cP$;84QDy(pG?l>sD1BzIa2AK8Jo#(M*AG+7d%hQuK71y zWl>mB{k`SjgRUPdzP5OUPrr65MS(Ayd5(YBceXCKJ!{q9ZQ7q7=BpI9T3Y4z)9vOn z=eG%Lzj|cCn^V1vN_VC)PkOuU&q2wU`+BE4{)k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1E2l#}zinxkdHQMOp=`E{}zdYB>RFR#>l%3CB;QzU3K0ZEKSy^TiklGDG zNfUt-Z%L3}@P8!0VEaO;4Jg4`;1OBOz`%DHgc*pgBxnl|hykKo(S&p@9KN_WHBkihG~MZvont>*?Yc65;-K+QFj33Op{Y zEfak|{l9-(^n%FE2W69@+ihp8VbxEnxp3*Tv+e<=8C49Sm#3}nU@~Tpf8TTDtW0j; ztM17vYC)l1>+W4nx&7hJwvUxpgcmY*AdtL= zQG;Eh>;6aOE2+~Dtb50h!m>>AfxUEeh0cQaz|W`@{ro&EUFj+asM?|wfY)xc^1a^gSf2B#mQ z756Sn-zs-$NKqDFY&Tbo-Bdavt_A;ivQC7aocE3jYSwQJk)z$J{GZ^n(V$x}N>3rbx ZPu6astxa>8cU%KSf~TvW%Q~loCIIyZ2qypl literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/centcomm_carapace.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/centcomm_carapace.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..51d2fc67c864f4321914029ea2ec81dbf2c25442 GIT binary patch literal 546 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijS1AIbUnN3*v9R!zE$X}joW~#`p6s%&^X!HMEv`(I$h^rV-)nd-<4nJ@ErzW#^d=bQhV!fXrS`7sn6_|F;uf^EDfAxY=uz74h`b7$v-vu^}5W$xB6cXNb@ik+|g$@Z#& zY3`zXDF@>nzGUs3&YDp!m2D|{ks){C_dPD6$L95~Z%VQfTl{#*9D~1Ih7+&k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`031o(uwGMljSI|weTkiR_FOet7JH%|ZmxoDuIy}?;tAjMG<X``L zU)Bs%vn@5kGtJXei-7~kVP%kFWMyCkvb=y;8p;OwLW7YREY1XE8!|F62mt9QAkJ)O z0gGn=*&vVr#321J8qHD$W(I}{>gCZIV?V3k3Z z7C;tMm!W|HNcQ@(-HLmk#cu&J4|}>ehD5l(oqCXuS&_p<^60z&{|gl-9@8yWwB7nN zHThA-y+@f(eoYYDav;-@d(M3kj+&#DPKy-MlUK!x&rN1Gsd8N6tSe%xKUpIo*wOXR zbas_n0*qn}$8FY6)=*$N7?s`kxy6N1cm>0@H*1|2HKYivxV33JUni4Uk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`031o(uwGMljSI|weTkiR_FOet7JH%|ZmxoDuIy}?;tAjMG<X``L zU)Bs%vn@5kGtJXei-7~kVP%kFWMyCkvb=y;8p;OwLW7YREY1XE8!|F62mt9QAkJ)O z0gGn=*&vVr#321J8qHD$W(I}{>gCZIV?V3k3Z z7C;tMm!W|HNcQ@(-HLmk#cu&J&w9EzhD5l(o$AeZ*nore;IXrR^JV^UHiqOn#F{3B z+${QHb96QP?fxYStaC+{Ech(Jm=J$4ee=VOQ@#EOu9)`mt@ZQ|Uql|so+$n=71yl5 zShA5@cpg(u$B$KZ&Ak4M3E69>nV#b{+rz@rv8U&-teK5Di^`)^nRgo=nljG+`FzfS zmVVwJf%|?>-|+pCd(ea?Kdzt)mD3bLE*_HP5B<{lYkz<%ch!RcS9uM`6^mF^IYPHA yV4c_{_C;7pRCk6ti&oTyk3dP6&-s7$CfqL5otZt;TD$Ng$djI~elF{r5}E*S60HXS literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/centcomm_carapace.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/centcomm_carapace.rsi/meta.json new file mode 100644 index 0000000000..04b59d99ab --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Armor/centcomm_carapace.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Assets derived from Wizden SS14 at https://github.com/space-wizards/space-station-14/commit/e4a516514f37d26708e676122eb7c6a95f37b5e3, modified by K-Dynamic (github).", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} -- 2.51.2