From eb3d8705f8258b9cf6ea0ae46bf283139618bb67 Mon Sep 17 00:00:00 2001 From: Vanilla1040 <94153240+Vanilla1040@users.noreply.github.com> Date: Thu, 8 May 2025 09:44:10 +0200 Subject: [PATCH] Adds a reskin for the berserker armor (#3728) ## About The Pull Request "Readds" the berserker armor from the Marked one megafauna, just as a craftable varient from the Red berserker armor that you can obtained from the lavaland chest, the stats of both are the exact same just a different look, the armor rating remains unchanged. This PR also adds the cape from Marked one as "Tettered Cloak" into the loadout menu ## Why It's Good For The Game More armor variety for lavaland armor and a cool looking "new" cloak ## Proof Of Testing compiles and works on my end ![image](https://github.com/user-attachments/assets/b172fa68-6be9-41c5-af57-9f1e5fe56126) ![image](https://github.com/user-attachments/assets/a0624c40-6f6f-42b4-bf10-ec1e1108aa2d) ## Changelog :cl: add: Added new reskin for the berserker armor add: Added new cloak in the loadout /:cl: --- .../mining/lavaland/mining_loot/berserker.dm | 2 +- .../game/objects/items/gladiator_items.dm | 23 +++++++++++++++++- .../gladiator/icons/berserk_suit_digi.dmi | Bin 1615 -> 1220 bytes .../datums/components/crafting/tailoring.dm | 9 +++++++ .../code/modules/loadout/categories/neck.dm | 4 +++ 5 files changed, 36 insertions(+), 2 deletions(-) diff --git a/code/modules/mining/lavaland/mining_loot/berserker.dm b/code/modules/mining/lavaland/mining_loot/berserker.dm index 2d84e7941cc..cc3a2d74a7f 100644 --- a/code/modules/mining/lavaland/mining_loot/berserker.dm +++ b/code/modules/mining/lavaland/mining_loot/berserker.dm @@ -13,7 +13,7 @@ icon_state = "berserker" icon = 'icons/obj/clothing/suits/armor.dmi' worn_icon = 'icons/mob/clothing/suits/armor.dmi' - worn_icon_digi = 'modular_skyrat/master_files/icons/mob/clothing/suit_digi.dmi' // SKYRAT EDIT - DIGIS + worn_icon_digi = 'modular_skyrat/master_files/icons/mob/clothing/suit_digi.dmi' // BUBBER EDIT - DIGIS hoodtype = /obj/item/clothing/head/hooded/berserker armor_type = /datum/armor/hooded_berserker cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS diff --git a/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm b/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm index 3713e036f54..bd8ffab6fa6 100644 --- a/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm +++ b/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm @@ -37,6 +37,11 @@ uses_advanced_reskins = FALSE resistance_flags = INDESTRUCTIBLE +/obj/item/clothing/neck/warrior_cape/loadout //Subtype for loadout item so i can make it not "indestructible" + name = "tattered cloak" + desc = "A cloak from a once feared foe now worn by those that have faced death in the eyes and prevailed, it looks rather worn as not as pristine as it used to be" + resistance_flags = FIRE_PROOF + /obj/item/clothing/neck/warrior_cape/examine() . = ..() . += span_warning("Struggle against the tide, no matter how strong it may be.") @@ -62,7 +67,7 @@ bio = 70 fire = 100 acid = 100 - + /datum/armor/drake_empowerment //Modular Override: nerfs beserker armour so I can keep this armour balanced laser = 10 energy = 0 @@ -235,6 +240,22 @@ new /obj/item/clothing/neck/warrior_cape(src) new /obj/item/crusher_trophy/gladiator(src) +// Bubber Edit and alt varient for berserker suit + +/obj/item/clothing/suit/hooded/berserker/gladiator + desc = "A suit of ancient body armor imbued with potent spiritual magnetism, capable of massively boosting a wearer's close combat skills at the cost of ravaging their mind and overexerting their body." + icon_state = "berk_suit" + icon = 'modular_skyrat/modules/gladiator/icons/berserk_icons.dmi' + worn_icon = 'modular_skyrat/modules/gladiator/icons/berserk_suit.dmi' + worn_icon_digi = 'modular_skyrat/modules/gladiator/icons/berserk_suit_digi.dmi' + hoodtype = /obj/item/clothing/head/hooded/berserker/gladiator + +/obj/item/clothing/head/hooded/berserker/gladiator + desc = "A uniquely styled helmet with ghastly red eyes that seals it's user inside." + icon_state = "berk_helm" + icon = 'modular_skyrat/modules/gladiator/icons/berserk_icons.dmi' + worn_icon = 'modular_skyrat/modules/gladiator/icons/berserk_suit.dmi' + #undef BERSERK_MAX_CHARGE #undef PROJECTILE_HIT_MULTIPLIER #undef DAMAGE_TO_CHARGE_SCALE diff --git a/modular_skyrat/modules/gladiator/icons/berserk_suit_digi.dmi b/modular_skyrat/modules/gladiator/icons/berserk_suit_digi.dmi index 5e6edb502575705f4d307222c9dbc75e459dcc68..3ca6b6e654a69ce140f8594b994429e0ade111f6 100644 GIT binary patch delta 1062 zcmV+>1ljw~48#c~iBL{Q4GJ0x0000DNk~Le0001B0001B2m=5B0M$l^3IG5AOOYi^ z82Enf@4=>h00001bW%=J06^y0W&i*Ha+5IuXMY~2T4e=SKNqkw0P>3|5;CaNlK=n% zsYygZRA_{5J8-EMF6s2|{d` zCC7lOeSV4&0Vcm-`Eo8~;bKAbGuxmpp7pbPyz_9efY!#-BHH(hdm6(2x)9uSPCK}#IC-bx$I2Dzs~1Ae2TV=oLw~l8 zvXnmm;h&C&auh9S9Rn+?YgmZ&S9mT*##SjuFM{3IpD%cb)>#82C}Fp8wsAUQhfC{4 zAik08clVVjo0OdQiR=^%mu=$dPng{u{5-f>z;sF{veO*y;jq=#4dBd}oZT0n?JnP^ z{R#u?{`76)r0;8T-`W?x{G6}pdVl`GF9YWjw)!pIu+dMp1~~~XkJga;?#@>{uZ&*? zF1z%G=Z)Nr0NwXzyU8Y-*dk|DVttx2%^z}pTui<5aFRdh#Yzc)=iw}Wcw7+iHQt%? z`~iYn5$Pr0@L`@mGy`(Cs@5dU^M|DOZ@oWTi|_{ifC%*RZZe2>@CUhgFn>7_yn{bT zFV$ZS^Y7pfN%D~F8GZ|YkW6c7U}ot&f6xddne8c>=MU0tCB5XE)~ES{99GL-Y%C@^ z%^%=Jg^9}RhmFqi2c&7qiyTIFhiU!*AC6cl;-hV0mOn@Y`G`$Yq%~xgKd1#sU}7(g zr}#rt@x0=jI_CI8YOhp!w13w4N&b*7vPmDU1yA#byK26Bmx?#=hfOxwB(DEQ{2?~b zum8vVVZcJC{vY#)NP_x*^T6c~0}|B#Q=dN!NKpSzef}_Hp;!MG>G6jV>DK>6I{aZs zy7hmN4u2SuZv9_9@cF}-fnNPT_4&h)bnE}A&mV@QU;pp(harjT|65)DFd|X?Kj06s zMD_oGKg1H%{{#Lopg*Yp2mB$Fxc=Yg50MPi{{#LINL>Gq_(LR7{XgOlLl%1V|A0RX gTIkgO1ODL1U!@fsRmId1nG5{+;05<>t04V??GXN|I z00tER5<37gF90YW02w*}G6etx7XT9qK>!Fb04fdu3@891K>#=)02?6y92Ni)5C9D> z04F2>9~uA_4*(1s02c`W2i_&}K>z>%0d!JMQvg8b*k%9#0CkaxXMdisT3ia06LD?+5dZId000DuNkln6v9zhJ z)!N$j|Nk1F*}aJ#GIQ6XAN4@T0HVM^hI3Hk z_+Ws2y zl*8uys5vGPx6biD5$Ek8H#mh>0#IhAe^)(4E9RfI~S#oq%zF^N6{@UM1>Wrj)y_*g0I z5nZ%;$T6J7`5GX-4Lpb%kkjWel!ETBAi#Af;M^a8i<2lF?4t^*ijkj)pS>tTJv2j@~Wwx0R!!%Nz=Yp2g+}+f?30 zVD53!-d6WYmm_?xw_y$nxhwCL>p2{8*3&c4LnV{zDGWO6->qYZSd|(;0}`f@vocOSOh{f^22l?~EaO!s z$U~CkHud&A1MM^0eHwZt0X&}9k+$&mcwrX&Qoq1&uvl%0b=hgRw00oywm#8m?TM(|GT97 zfpkBR?g!HSK)N4D_XFvEAl(n7`+;;nknRW4{eM7`BuSDasRrRuY4~uo`>3i^+?c^& z5DlW6S4#qW3O?FD_?`)j_4q@bT~N_C0PBGKuqUbvhKFqY_~>}7xbV(T+6h$PI1mB5P_fyvb~$r`B{ zOn(A!dM2DxH92|Y&%dtgnR1Svz;%Sc@NoY})p$4PRMYzW<_4;5TD_ zR|vd#9RQ?Rj=v~C1vh^%ez$$@61d*Gc%|51ziB5B`oD$1F5~kEfwzAi9V_-#^{#m$ z$FtQ^Yl2rE7ajcd=CQWBh5XI-Q;opsCj?eYB~IY=`+sgC1pf8YR3mWwl?2|tyg-~s z2s~{iF#bvc@8A75ju5zPv7e7WDZ*;C*=DgKG%dSZs*I;xX}!Jj8XN!s N002ovPDHLkV1jkIZlwSK diff --git a/modular_zubbers/code/datums/components/crafting/tailoring.dm b/modular_zubbers/code/datums/components/crafting/tailoring.dm index e5e6b2c76f2..0c6b966acd0 100644 --- a/modular_zubbers/code/datums/components/crafting/tailoring.dm +++ b/modular_zubbers/code/datums/components/crafting/tailoring.dm @@ -59,3 +59,12 @@ /datum/crafting_recipe/modulator_gasmask/New() ..() blacklist += subtypesof(/obj/item/clothing/mask/gas) + +/datum/crafting_recipe/berserker_reskin + name = "Marked One Grafting" + result = /obj/item/clothing/suit/hooded/berserker/gladiator + reqs = list(/obj/item/clothing/suit/hooded/berserker = 1, + /obj/item/stack/ore/glass/basalt = 5, + /obj/item/stack/ore/titanium =5) + time = 5 SECONDS + category = CAT_CLOTHING diff --git a/modular_zubbers/code/modules/loadout/categories/neck.dm b/modular_zubbers/code/modules/loadout/categories/neck.dm index 8e289d0e62f..2a251433f81 100644 --- a/modular_zubbers/code/modules/loadout/categories/neck.dm +++ b/modular_zubbers/code/modules/loadout/categories/neck.dm @@ -70,3 +70,7 @@ name = "Detective's Holobadge" item_path = /obj/item/clothing/accessory/badge/holo/detective restricted_roles = list(JOB_DETECTIVE) + +/datum/loadout_item/neck/warrior_cape_worn + name = "tattered cloak" + item_path = /obj/item/clothing/neck/warrior_cape/loadout