diff --git a/modular_sand/code/modules/clothing/spacesuits/hardsuit.dm b/modular_sand/code/modules/clothing/spacesuits/hardsuit.dm index f54c4142c543..4ab1a23af561 100644 --- a/modular_sand/code/modules/clothing/spacesuits/hardsuit.dm +++ b/modular_sand/code/modules/clothing/spacesuits/hardsuit.dm @@ -5,42 +5,14 @@ icon = 'modular_sand/icons/obj/clothing/hats.dmi' mob_overlay_icon = 'modular_sand/icons/mob/clothing/head.dmi' anthro_mob_worn_overlay = 'modular_sand/icons/mob/clothing/head_muzzled.dmi' - icon_state = "hardsuit0-powerarmor-1" - item_state = "hardsuit0-powerarmor-1" + icon_state = "hardsuit0-powerarmor" + item_state = "hardsuit0-powerarmor" hardsuit_type = "powerarmor" clothing_flags = THICKMATERIAL //Ouchie oofie my bones armor = list("melee" = 40, "bullet" = 35, "laser" = 30, "energy" = 20, "bomb" = 40, "bio" = 100, "rad" = 5, "fire" = 75, "acid" = 100) resistance_flags = ACID_PROOF mutantrace_variation = STYLE_MUZZLE -/obj/item/clothing/head/helmet/space/hardsuit/powerarmor/Initialize(mapload) - . = ..() - AddComponent(/datum/component/spraycan_paintable) - update_icon() - -/obj/item/clothing/head/helmet/space/hardsuit/powerarmor/update_overlays() - . = ..() - var/mutable_appearance/glass_overlay = mutable_appearance(icon, "hardsuit0-powerarmor-2") - if(icon_state == "hardsuit1-powerarmor-1") - glass_overlay = mutable_appearance(icon, "hardsuit1-powerarmor-2") - var/mutable_appearance/flight_overlay = mutable_appearance(icon, "hardsuit1-powerarmor-3") - flight_overlay.appearance_flags = RESET_COLOR - . += flight_overlay - glass_overlay.appearance_flags = RESET_COLOR - . += glass_overlay - -/obj/item/clothing/head/helmet/space/hardsuit/powerarmor/worn_overlays(isinhands, icon_file, used_state, style_flags = NONE) - . = ..() - if(!isinhands) - var/mutable_appearance/M1 = mutable_appearance(icon_file, "hardsuit0-powerarmor-2") - if(icon_state == "hardsuit1-powerarmor-1") - M1 = mutable_appearance(icon_file, "hardsuit1-powerarmor-2") - var/mutable_appearance/M2 = mutable_appearance(icon, "hardsuit1-powerarmor-3") - M2.appearance_flags = RESET_COLOR - . += M2 - M1.appearance_flags = RESET_COLOR - . += M1 - /obj/item/clothing/head/helmet/space/hardsuit/powerarmor/equipped(mob/living/carbon/human/user, slot) ..() if (slot == ITEM_SLOT_HEAD) @@ -59,42 +31,32 @@ icon = 'modular_sand/icons/obj/clothing/suits.dmi' mob_overlay_icon = 'modular_sand/icons/mob/clothing/suit.dmi' anthro_mob_worn_overlay = 'modular_sand/icons/mob/clothing/suit_digi.dmi' - icon_state = "hardsuit-powerarmor-1" - item_state = "hardsuit-powerarmor-1" + icon_state = "hardsuit-powerarmor" + item_state = "hardsuit-powerarmor" slowdown = -0.1 clothing_flags = THICKMATERIAL //Not spaceproof. No, it isn't Spaceproof in Rimworld either. - armor = list("melee" = 40, "bullet" = 35, "laser" = 30, "energy" = 20, "bomb" = 40, "bio" = 100, "rad" = 5, "fire" = 75, "acid" = 100) //I was asked to buff this again. Here, fine. + armor = list("melee" = 60, "bullet" = 55, "laser" = 20, "energy" = 20, "bomb" = 70, "bio" = 100, "rad" = 75, "fire" = 75, "acid" = 100) //I was asked to buff this again. Here, fine. resistance_flags = ACID_PROOF var/explodioprobemp = 1 var/stamdamageemp = 200 var/brutedamageemp = 20 var/rebootdelay helmettype = /obj/item/clothing/head/helmet/space/hardsuit/powerarmor - mutantrace_variation = STYLE_DIGITIGRADE - -/obj/item/clothing/suit/space/hardsuit/powerarmor/Initialize(mapload) - . = ..() - AddComponent(/datum/component/spraycan_paintable) - update_icon() + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_SNEK_TAURIC + //BLUEMOON ADD вариация силовухи + unique_reskin = list( + "T-60" = list(RESKIN_ICON_STATE = "hardsuit-powerarmor2"), + ) -/obj/item/clothing/suit/space/hardsuit/powerarmor/update_overlays() - . = ..() - var/mutable_appearance/black_overlay = mutable_appearance(icon, "hardsuit-powerarmor-2") - black_overlay.appearance_flags = RESET_COLOR - var/mutable_appearance/bluecore_overlay = mutable_appearance(icon, "hardsuit-powerarmor-3") - bluecore_overlay.appearance_flags = RESET_COLOR - . += black_overlay - . += bluecore_overlay - -/obj/item/clothing/suit/space/hardsuit/powerarmor/worn_overlays(isinhands, icon_file, used_state, style_flags = NONE) - . = ..() - if(!isinhands) - var/mutable_appearance/M1 = mutable_appearance(icon_file, "hardsuit-powerarmor-2") - M1.appearance_flags = RESET_COLOR - var/mutable_appearance/M2 = mutable_appearance(icon_file, "hardsuit-powerarmor-3") - M2.appearance_flags = RESET_COLOR - . += M1 - . += M2 +/obj/item/clothing/suit/space/hardsuit/powerarmor/reskin_obj(mob/user) + if(current_skin == "T-60") + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_SNEK_TAURIC + tail_state = "sec2" + if(helmet) + var/obj/item/clothing/head/helmet/space/hardsuit/Helm = helmet + Helm.hardsuit_type = "hardsuit0-powerarmor2" + Helm.update_icon_state() + //BLUEMOON ADD END /obj/item/clothing/suit/space/hardsuit/powerarmor/emp_act() . = ..() diff --git a/modular_sand/code/modules/research/techweb/nodes/robotics_nodes.dm b/modular_sand/code/modules/research/techweb/nodes/robotics_nodes.dm index 4fc02785a7d0..d8ad03988d72 100644 --- a/modular_sand/code/modules/research/techweb/nodes/robotics_nodes.dm +++ b/modular_sand/code/modules/research/techweb/nodes/robotics_nodes.dm @@ -3,7 +3,7 @@ display_name = "Full Body Exoskeleton" description = "Utilizing fluctuations in bluespace crystals, we can draw small amounts of energy to create self-powered body enhancing suits." prereq_ids = list("adv_biotech", "adv_bluespace", "adv_robotics") - design_ids = list("powerarmor_skeleton","powerarmor_torso","powerarmor_helmet","powerarmor_armR","powerarmor_armL","powerarmor_legR","powerarmor_legL") + design_ids = list("powerarmor_skeleton","powerarmor_torso","powerarmor_helmet","powerarmor_armR","powerarmor_armL","powerarmor_legR","powerarmor_legL","fusion_core") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 7500) /datum/techweb_node/adv_robotics/New() diff --git a/modular_sand/icons/mecha/mech_construct.dmi b/modular_sand/icons/mecha/mech_construct.dmi index ecfe3acb6ddb..bdd8611bc378 100644 Binary files a/modular_sand/icons/mecha/mech_construct.dmi and b/modular_sand/icons/mecha/mech_construct.dmi differ diff --git a/modular_sand/icons/mecha/mech_construction.dmi b/modular_sand/icons/mecha/mech_construction.dmi index 837a3d610019..019e1a6f8632 100644 Binary files a/modular_sand/icons/mecha/mech_construction.dmi and b/modular_sand/icons/mecha/mech_construction.dmi differ diff --git a/modular_sand/icons/mob/clothing/head.dmi b/modular_sand/icons/mob/clothing/head.dmi index 62d8d6ec746e..5466a4116569 100644 Binary files a/modular_sand/icons/mob/clothing/head.dmi and b/modular_sand/icons/mob/clothing/head.dmi differ diff --git a/modular_sand/icons/mob/clothing/head_muzzled.dmi b/modular_sand/icons/mob/clothing/head_muzzled.dmi index 94096cf77225..cb02ff694600 100644 Binary files a/modular_sand/icons/mob/clothing/head_muzzled.dmi and b/modular_sand/icons/mob/clothing/head_muzzled.dmi differ diff --git a/modular_sand/icons/mob/clothing/suit.dmi b/modular_sand/icons/mob/clothing/suit.dmi index 0e1b74f918b4..80ef43162e94 100644 Binary files a/modular_sand/icons/mob/clothing/suit.dmi and b/modular_sand/icons/mob/clothing/suit.dmi differ diff --git a/modular_sand/icons/mob/clothing/suit_digi.dmi b/modular_sand/icons/mob/clothing/suit_digi.dmi index e913de6a1d77..067e8d900e00 100644 Binary files a/modular_sand/icons/mob/clothing/suit_digi.dmi and b/modular_sand/icons/mob/clothing/suit_digi.dmi differ diff --git a/modular_sand/icons/obj/clothing/hats.dmi b/modular_sand/icons/obj/clothing/hats.dmi index 238bc8d70500..ffff1e89dd2f 100644 Binary files a/modular_sand/icons/obj/clothing/hats.dmi and b/modular_sand/icons/obj/clothing/hats.dmi differ diff --git a/modular_sand/icons/obj/clothing/head.dmi b/modular_sand/icons/obj/clothing/head.dmi index a7a532335d95..10c81840edcb 100644 Binary files a/modular_sand/icons/obj/clothing/head.dmi and b/modular_sand/icons/obj/clothing/head.dmi differ diff --git a/modular_sand/icons/obj/clothing/suit_digi.dmi b/modular_sand/icons/obj/clothing/suit_digi.dmi index 70920203a5da..fea0da779971 100644 Binary files a/modular_sand/icons/obj/clothing/suit_digi.dmi and b/modular_sand/icons/obj/clothing/suit_digi.dmi differ diff --git a/modular_sand/icons/obj/clothing/suits.dmi b/modular_sand/icons/obj/clothing/suits.dmi index 87f2eaf0a4ff..0c523ddb51a8 100644 Binary files a/modular_sand/icons/obj/clothing/suits.dmi and b/modular_sand/icons/obj/clothing/suits.dmi differ diff --git a/tgstation.dme b/tgstation.dme index a88733cb64e1..4ae14590ed29 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4378,6 +4378,8 @@ #include "modular_bluemoon\krashly\modulars\clownfart\code.dm" #include "modular_bluemoon\lazybodia\code\snouts.dm" #include "modular_bluemoon\loadout_rings\rings.dm" +#include "modular_bluemoon\nopeingeener\power_block\code\fusion_core.dm" +#include "modular_bluemoon\nopeingeener\power_block\code\power_block.dm" #include "modular_bluemoon\phenyamomota\code\modules\cargo\packs\engineering.dm" #include "modular_bluemoon\phenyamomota\code\modules\clothing\labcoat.dm" #include "modular_bluemoon\phenyamomota\code\modules\clothing\under_med.dm"