From 29367b1b22879c4f763a1f9c269d6f8daeeb2c22 Mon Sep 17 00:00:00 2001 From: Lumipharon Date: Tue, 8 Oct 2024 11:24:41 +1300 Subject: [PATCH 1/2] var kills --- code/datums/components/shield.dm | 3 +-- code/modules/clothing/clothing.dm | 7 ++----- code/modules/clothing/modular_armor/attachments/modules.dm | 6 ++---- code/modules/clothing/suits/marine_armor.dm | 6 ++---- 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/code/datums/components/shield.dm b/code/datums/components/shield.dm index 831d1e58c07eb..a35106694b3c6 100644 --- a/code/datums/components/shield.dm +++ b/code/datums/components/shield.dm @@ -290,9 +290,8 @@ . = ..() if(!shield_integrity) return - var/obj/item/clothing/suit/reactive_suit = parent var/mob/living/carbon/human/affected_human = affected - affected_human.overlays_standing[OVERHEALTH_SHIELD_LAYER] = list(mutable_appearance('icons/effects/effects.dmi', reactive_suit.shield_state, affected.layer + 0.01)) + affected_human.overlays_standing[OVERHEALTH_SHIELD_LAYER] = list(mutable_appearance('icons/effects/effects.dmi', "shield-blue", affected.layer + 0.01)) affected_human.apply_overlay(OVERHEALTH_SHIELD_LAYER) /datum/component/shield/overhealth/deactivate_with_user() diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 3055f1ce230bd..c5a8bc782887e 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -144,14 +144,11 @@ w_class = WEIGHT_CLASS_NORMAL attachments_by_slot = list(ATTACHMENT_SLOT_BADGE) attachments_allowed = list(/obj/item/armor_module/armor/badge) - var/supporting_limbs = NONE - var/blood_overlay_type = "suit" - var/shield_state = "shield-blue" - - // Strength of the armor light used by [proc/set_light()] light_power = 3 light_range = 4 light_system = MOVABLE_LIGHT + ///Blood overlay icon_state + var/blood_overlay_type = "suit" /obj/item/clothing/suit/Initialize(mapload) . = ..() diff --git a/code/modules/clothing/modular_armor/attachments/modules.dm b/code/modules/clothing/modular_armor/attachments/modules.dm index 5a79629df882c..594d202dea357 100644 --- a/code/modules/clothing/modular_armor/attachments/modules.dm +++ b/code/modules/clothing/modular_armor/attachments/modules.dm @@ -46,8 +46,6 @@ slowdown = 0.3 slot = ATTACHMENT_SLOT_MODULE variants_by_parent_type = list(/obj/item/clothing/suit/modular/xenonauten = "mod_autodoc_xn", /obj/item/clothing/suit/modular/tdf = "") - ///The limbs this module supports - var/static/list/supported_limbs = list(CHEST, GROIN, ARM_LEFT, ARM_RIGHT, HAND_LEFT, HAND_RIGHT, LEG_LEFT, LEG_RIGHT, FOOT_LEFT, FOOT_RIGHT) /obj/item/armor_module/module/valkyrie_autodoc/on_attach(obj/item/attaching_to, mob/user) . = ..() @@ -55,11 +53,11 @@ var/list/tramadol = list(/datum/reagent/medicine/tramadol) /// This will do nothing without the autodoc update parent.AddComponent(/datum/component/suit_autodoc, 4 MINUTES, tricord, tricord, tricord, tricord, tramadol, 0.5) - parent.AddElement(/datum/element/limb_support, supported_limbs) + parent.AddElement(/datum/element/limb_support) /obj/item/armor_module/module/valkyrie_autodoc/on_detach(obj/item/detaching_from, mob/user) detaching_from.remove_component(/datum/component/suit_autodoc) - detaching_from.RemoveElement(/datum/element/limb_support, supported_limbs) + detaching_from.RemoveElement(/datum/element/limb_support) return ..() /obj/item/armor_module/module/valkyrie_autodoc/som diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index 7ef613f36cfa6..acf592ee6ab50 100644 --- a/code/modules/clothing/suits/marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor.dm @@ -155,7 +155,6 @@ icon_state = "xarmor" soft_armor = list(MELEE = 75, BULLET = 80, LASER = 80, ENERGY = 85, BOMB = 85, BIO = 70, FIRE = 85, ACID = 70) slowdown = SLOWDOWN_ARMOR_MEDIUM - supporting_limbs = CHEST | GROIN | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_LEFT | LEG_RIGHT | FOOT_LEFT | FOOT_RIGHT | HEAD //B18 effectively stabilizes these. resistance_flags = UNACIDABLE item_flags = AUTOBALANCE_CHECK @@ -163,7 +162,7 @@ . = ..() AddComponent(/datum/component/suit_autodoc) AddComponent(/datum/component/stun_mitigation, slot_override = SLOT_WEAR_SUIT, shield_cover = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 50, BIO = 50, FIRE = 50, ACID = 50)) - AddElement(/datum/element/limb_support, supporting_limbs) + AddElement(/datum/element/limb_support) if(item_flags & AUTOBALANCE_CHECK) SSmonitor.stats.b18_in_use += src @@ -313,13 +312,12 @@ attachments_by_slot = list(ATTACHMENT_SLOT_STORAGE) attachments_allowed = list(/obj/item/armor_module/storage/grenade) starting_attachments = list(/obj/item/armor_module/storage/grenade) - supporting_limbs = CHEST | GROIN | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_LEFT | LEG_RIGHT | FOOT_LEFT | FOOT_RIGHT | HEAD //B18 effectively stabilizes these. resistance_flags = UNACIDABLE /obj/item/clothing/suit/storage/marine/veteran/pmc/commando/Initialize(mapload, ...) . = ..() AddComponent(/datum/component/suit_autodoc) - AddElement(/datum/element/limb_support, supporting_limbs) + AddElement(/datum/element/limb_support) /*===========================I.o.M================================*/ From 0f1b30b62a02916b073fd2a2b66a0ce5cdebf175 Mon Sep 17 00:00:00 2001 From: Lumipharon Date: Tue, 8 Oct 2024 11:32:18 +1300 Subject: [PATCH 2/2] TDF B18 icon fix --- code/modules/clothing/head/helmet.dm | 1 + code/modules/clothing/suits/marine_armor.dm | 7 ++++--- icons/mob/modular/tdf_armor.dmi | Bin 2583 -> 2579 bytes icons/mob/modular/tdf_helmets.dmi | Bin 2744 -> 2739 bytes 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 86d545d732a1c..ba846c532298d 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -231,6 +231,7 @@ ) icon_state = "tdf_helmet_hardsuit" worn_icon_state = "tdf_helmet_hardsuit" + item_map_variant_flags = NONE /obj/item/clothing/head/helmet/marine/grenadier name = "\improper B17 helmet" diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index acf592ee6ab50..e907284f1375a 100644 --- a/code/modules/clothing/suits/marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor.dm @@ -171,6 +171,9 @@ SSmonitor.stats.b18_in_use -= src return ..() +/obj/item/clothing/suit/storage/marine/specialist/valhalla + item_flags = NONE + /obj/item/clothing/suit/storage/marine/specialist/tdf name = "\improper Ace class hardsuit" desc = "The Ace class is what would be called a light hardsuit, good mobility and good protection compared to the standard TDF battle armor but pales in comparison to the more advanced and heavier hardsuits out there and not as fancy, it's integrated SMES only provides enough power for its powered exoskeleton and the autodoc system to run for several hours. Provides excellent protection however it does reduce mobility somewhat. Alt-Click to remove attached items. Use it to toggle the built-in flashlight." @@ -182,9 +185,7 @@ ) icon_state = "tdf_hardsuit" worn_icon_state = "tdf_hardsuit" - -/obj/item/clothing/suit/storage/marine/specialist/valhalla - item_flags = NONE + item_map_variant_flags = NONE /obj/item/clothing/suit/storage/marine/B17 name = "\improper B17 defensive armor" diff --git a/icons/mob/modular/tdf_armor.dmi b/icons/mob/modular/tdf_armor.dmi index e598c7b28b67eef4b2a315f6d9ed63c046243053..ef1281649ad3a979b5921e210fd3ca93e99fe191 100644 GIT binary patch delta 46 zcmV+}0MY-K6q6K?WC4|tWq=(>u^_Q1rMNV+1eaoE1y?^8aQFZKHUwCjg;$`^vjzbX E36`%AZU6uP delta 50 zcmV-20L}lC6qgi`WC59xWq=`w)Q}qwwj!}8rMNV+1ebDU1y?^8a0mea^BGxY=v!^0 IvjPDT3F-C{4gdfE diff --git a/icons/mob/modular/tdf_helmets.dmi b/icons/mob/modular/tdf_helmets.dmi index 764ac8cb6f32dcc3f02cb91ab80db12ffb1c8245..461b26e3c3916f54993786a41a68ff823592bc5d 100644 GIT binary patch delta 153 zcmV;K0A~NV6|)tPf&r_MgDijB-blf;7YuJN=&D1zoilv7$;r*dwXEt!6t|ks-~*0> zxQO#^&)EwV*|nUGoLN9)>01Ixf;DEObZen^K<&Mk-6P{np%0tqOnd2I%ZH!9fx^kf zI}37N;#m(;fsc33#gFkyckw2ev=I|d!C)|9dFfS{kp7umluhyZqc;dnRk-8rMb;Lx HI{|$O6Wjkm1a+8yrigR9+mB=n7AHfIg zJ8=@n&6cwVDl&69>^U=l+R(cMk_2;1NVT;A>wxO3mCY^TOrZ~p=dAV8!IF1hfdhqu zi+2X(IK?vyQh|?m_sRG1s%_#;(CbEAaSA$(e=1jhZZEwG1JW;*io6ZVUZ3;?%j3DP MffG+2vo-;J36h9Q!~g&Q